diff --git a/.ci/flake8_ignorelist.txt b/.ci/flake8_ignorelist.txt
index 298dace888f..f1cffc4f595 100644
--- a/.ci/flake8_ignorelist.txt
+++ b/.ci/flake8_ignorelist.txt
@@ -9,9 +9,7 @@ packages/venv
 node_modules
 database
 doc/build
-doc/source/conf.py
 eggs
-lib/galaxy/util/jstree.py
 lib/galaxy/web/proxy/js/node_modules
 static/maps
 static/scripts
diff --git a/.ci/ignore-spelling.txt b/.ci/ignore-spelling.txt
new file mode 100644
index 00000000000..62397276eda
--- /dev/null
+++ b/.ci/ignore-spelling.txt
@@ -0,0 +1 @@
+hda
diff --git a/.flake8 b/.flake8
index 4655c52d927..fe463fb975e 100644
--- a/.flake8
+++ b/.flake8
@@ -3,8 +3,7 @@
 # B008 Do not perform function calls in argument defaults (for FastAPI Depends and Body)
 # E203 is whitespace before ':'; we follow black's formatting here. See https://black.readthedocs.io/en/stable/faq.html#why-are-flake8-s-e203-and-w503-violated
 # E402 module level import not at top of file # TODO, we would like to improve this.
-# E501 is line length
+# E501 is line length (delegated to black)
 # W503 is line breaks before binary operators, which has been reversed in PEP 8.
 # D** are docstring linting - which we mostly ignore except D302. (Hopefully we will solve more over time).
 ignore = B008,E203,E402,E501,W503,D100,D101,D102,D103,D104,D105,D106,D107,D200,D201,D202,D204,D205,D206,D207,D208,D209,D210,D211,D300,D301,D400,D401,D402,D403,D412,D413
-exclude = lib/galaxy/util/jstree.py
diff --git a/.github/workflows/lint_openapi_schema.yml b/.github/workflows/lint_openapi_schema.yml
new file mode 100644
index 00000000000..00c279d0d5a
--- /dev/null
+++ b/.github/workflows/lint_openapi_schema.yml
@@ -0,0 +1,60 @@
+name: OpenAPI linting
+on:
+  push:
+    paths-ignore:
+      - 'client/**'
+      - 'doc/**'
+      - 'lib/galaxy_test/selenium/**'
+  pull_request:
+    paths-ignore:
+      - 'client/**'
+      - 'doc/**'
+      - 'lib/galaxy_test/selenium/**'
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  validate-schema:
+    name: Validate OpenAPI schema
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ['3.7']
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          path: 'galaxy root'
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Get full Python version
+        id: full-python-version
+        shell: bash
+        run: echo "version=$(python -c 'import sys; print("-".join(str(v) for v in sys.version_info))')" >> $GITHUB_OUTPUT
+      - name: Cache pip dir
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/pip
+          key: pip-cache-${{ matrix.python-version }}-${{ hashFiles('galaxy root/requirements.txt') }}
+      - name: Cache galaxy venv
+        uses: actions/cache@v3
+        with:
+          path: 'galaxy root/.venv'
+          key: gxy-venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-api
+      - name: Install dependencies
+        run: ./scripts/common_startup.sh --skip-client-build
+        working-directory: 'galaxy root'
+      - name: Lint schema
+        run: make lint-api-schema
+        working-directory: 'galaxy root'
+      - name: Build typescript schema
+        run: make update-client-api-schema
+        working-directory: 'galaxy root'
+      - name: Check for changes
+        run: |
+          if [[ `git status --porcelain` ]]; then
+            echo "Rebuilding client/src/schema/schema.ts resulted in changes, run 'make update-client-api-schema' and commit results"
+            exit 1
+          fi
+        working-directory: 'galaxy root'
diff --git a/.isort.cfg b/.isort.cfg
index 2a7408c3311..c99585f7f27 100644
--- a/.isort.cfg
+++ b/.isort.cfg
@@ -1,6 +1,5 @@
 [settings]
 combine_as_imports=true
-extend_skip=doc/source/conf.py,lib/galaxy/util/jstree.py
 force_alphabetical_sort_within_sections=true
 # Override force_grid_wrap value from profile=black, but black is still happy
 force_grid_wrap=2
diff --git a/.redocly.lint-ignore.yaml b/.redocly.lint-ignore.yaml
new file mode 100644
index 00000000000..01997597ceb
--- /dev/null
+++ b/.redocly.lint-ignore.yaml
@@ -0,0 +1,16 @@
+# This file instructs Redocly's linter to ignore the rules contained for specific parts of your API.
+# See https://redoc.ly/docs/cli/ for more information.
+_schema.yaml:
+  no-empty-servers:
+    - '#/openapi'
+  no-ambiguous-paths:
+    - >-
+      #/paths/~1api~1histories~1{history_id}~1contents~1{dataset_id}~1permissions
+    - >-
+      #/paths/~1api~1histories~1{history_id}~1contents~1{history_content_id}~1display
+    - >-
+      #/paths/~1api~1histories~1{history_id}~1contents~1{history_content_id}~1extra_files
+    - >-
+      #/paths/~1api~1histories~1{history_id}~1contents~1{history_content_id}~1metadata_file
+    - '#/paths/~1api~1histories~1{history_id}~1contents~1{id}~1validate'
+    - '#/paths/~1api~1histories~1{history_id}~1contents~1{type}s~1{id}'
diff --git a/.redocly.yaml b/.redocly.yaml
new file mode 100644
index 00000000000..15897fe5d31
--- /dev/null
+++ b/.redocly.yaml
@@ -0,0 +1,5 @@
+organization: galaxyproject.org
+extends:
+  - recommended
+rules:
+  operation-4xx-response: off
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7de433d88aa..e876012fa8d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -157,8 +157,8 @@ https://help.github.com/en/github/getting-started-with-github/git-and-github-lea
 - Galaxy follows [PEP-8](https://www.python.org/dev/peps/pep-0008/), with
   particular emphasis on readability being the ultimate goal:
   - 4 spaces (not tabs!) per indentation level
-  - divergences from PEP-8 are listed in the `[flake8]` section of the
-    `.flake8` file
+  - divergences from PEP-8 are listed in the `[flake8]` section of the `.flake8`
+    file and in the `[tool.ruff]` section of the `pyproject.toml` file.
   - The Python code base is automatically formatted using
     [isort](https://pycqa.github.io/isort/) (for imports) and
     [black](https://black.readthedocs.io). To easily format your Python code
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index e38b9ea764f..87e587cac53 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -11,7 +11,7 @@ The following individuals have contributed code to Galaxy:
 * Patrick Austin <patrick.austin@stfc.ac.uk>
 * Raj Ayyampalayam <raj76@uga.edu>
 * Abdulrahman Azab <eng.azab@gmail.com>
-* Finn Bacall <finn.bacall@cs.man.ac.uk>
+* Finn Bacall <finn.bacall@manchester.ac.uk>
 * Dannon Baker <dannon.baker@gmail.com>
 * balto <balto_59@hotmail.fr>
 * Christopher Bare <christopherbare@gmail.com>
diff --git a/Makefile b/Makefile
index 62972721db6..d2748e0ff5d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 # Location of virtualenv used for development.
 VENV?=.venv
-# Source virtualenv to execute command (flake8, sphinx, twine, etc...)
+# Source virtualenv to execute command (darker, sphinx, twine, etc...)
 IN_VENV=if [ -f "$(VENV)/bin/activate" ]; then . "$(VENV)/bin/activate"; fi;
 RELEASE_CURR:=23.0
 RELEASE_UPSTREAM:=upstream
@@ -170,8 +170,20 @@ else
 endif
 
 
-update-client-api-schema: node-deps
-	$(IN_VENV) cd client && python ../scripts/dump_openapi_schema.py | yarn run openapi-typescript --output src/schema/schema.ts && npx prettier --write src/schema/schema.ts
+build-api-schema:
+	$(IN_VENV) python scripts/dump_openapi_schema.py _schema.yaml
+
+remove-api-schema:
+	rm _schema.yaml
+
+update-client-api-schema: node-deps build-api-schema
+	$(IN_VENV) cd client && node openapi_to_schema.mjs ../_schema.yaml > src/schema/schema.ts && npx prettier --write src/schema/schema.ts
+	$(MAKE) remove-api-schema
+
+lint-api-schema: build-api-schema
+	$(IN_VENV) npx --yes @redocly/cli lint _schema.yaml
+	$(IN_VENV) codespell -I .ci/ignore-spelling.txt _schema.yaml
+	$(MAKE) remove-api-schema
 
 client: node-deps ## Rebuild client-side artifacts for local development.
 	cd client && yarn run build
diff --git a/SECURITY.md b/SECURITY.md
index 77928a15c5b..2b30ab9b110 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -54,10 +54,11 @@ embargo, we will:
 - Patch the oldest release within the 12 month support window, and merge that fix forward.
   - Updates will be available on the `release_XX.YY` branches.
 - Update each release branch
-- Post a notice to the [galaxy-announce mailing list](https://lists.galaxyproject.org/listinfo/galaxy-announce) with:
+- Publish a repository security advisory on GitHub containing:
   - A description of the issue
   - List of supported versions that are affected
   - Steps to update or patch your Galaxy
+  - A CVE identifier (if applicable)
 
 If an issue is deemed to be time-sensitive – e.g. due to active and ongoing exploits in the wild – the embargo may be shortened considerably.
 
diff --git a/client/.eslintrc.json b/client/.eslintrc.json
index 9dc0251f439..f13b7808484 100644
--- a/client/.eslintrc.json
+++ b/client/.eslintrc.json
@@ -16,7 +16,7 @@
     "rules": {
         // Standard rules
         "no-console": "off",
-        "no-unused-vars": ["error", { "args": "none" }],
+        "no-unused-vars": ["error", { "args": "none", "varsIgnorePattern": "[iI]gnoreUnused.*"}],
         "prefer-const": "error",
         "one-var": ["error", "never"],
         "curly": "error",
diff --git a/client/docs/composables.md b/client/docs/composables.md
index 2ba75d898fc..a7a22b5c6d3 100644
--- a/client/docs/composables.md
+++ b/client/docs/composables.md
@@ -87,7 +87,7 @@ While simpler in this example, you may need to manually mock more return values
 
 ## Using Composables for more than Stores
 
-Composables can be of great use to extract any reactive code from your components. For an example of this, take a look at [userFilterObjectArray](https://github.com/galaxyproject/galaxy/blob/dev/client/src/composables/utils/filter.js).
+Composables can be of great use to extract any reactive code from your components. For an example of this, take a look at [useFilterObjectArray](https://github.com/galaxyproject/galaxy/blob/dev/client/src/composables/utils/filter.js).
 
 Usage:
 
diff --git a/client/docs/providers-and-renderers.md b/client/docs/providers-and-renderers.md
index 480bef218ef..1eca93b3e13 100644
--- a/client/docs/providers-and-renderers.md
+++ b/client/docs/providers-and-renderers.md
@@ -134,7 +134,7 @@ mandatory markup, just one big empty slot.
 // Testing a renderless component
 
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue, waitForLifecyleEvent } from "jest/helpers";
+import { getLocalVue, waitForLifecyleEvent } from "tests/jest/helpers"
 import DoodadProvider from "./DoodadProvider";
 
 describe("A renderless component", () => {
diff --git a/client/docs/styleguide.md b/client/docs/styleguide.md
new file mode 100644
index 00000000000..938ed22fc23
--- /dev/null
+++ b/client/docs/styleguide.md
@@ -0,0 +1,441 @@
+# Styleguide
+
+Most of the client's code style is handled by Prettier. Prettier does a good job of keeping an overall consistent code style, however there are some cases it cannot account for.
+This document serves as a guide on how to style your code in such cases, with explanations as to why.
+Treat it more like a set of recommendations than hard rules.
+
+## Naming
+
+Do not abbreviate. This includes naming variables, functions and modules.
+
+> **Do**
+>
+> ```js
+> function errorMessageTemplate(workflowfName, errorMessage) {
+>     return `Failed to run ${workflowfName}. ${errorMessage}`;
+> }
+> ```
+>
+> **Don't**
+>
+> ```js
+> function eMsgTmpl(wfName, msg) {
+>     return `Failed to run ${wfName}. ${msg}`;
+> }
+> ```
+
+> **Reason**
+>
+> While abbreviation may save a few keystrokes now, it will make the code harder to understand, and therefore maintain. Even when you think the abbreviations are obvious within this context, consider people looking at your code in the future might not have the same context you do when writing the code.
+
+## Functions
+
+There are several ways to define functions in JavaScript.
+
+```js
+// named function
+function myFunction(param) {
+    // do stuff
+}
+
+// arrow functions
+const myFunction = (param) => {
+    // do stuff
+};
+
+// anonymous functions
+const myFunction = function(param) {
+    //do stuff
+};
+```
+
+Only use the first two.
+`anonymous functions` have mostly been superseded by `arrow functions`
+
+### When to use the named functions
+
+Use named functions in the top-level module scope and to declare class methods.
+
+> **Reason**
+>
+> `function` is easy to process and understand at a glance. In module scope, arrow functions offer no benefit over regular functions, and they are not allowed as class methods.
+
+### When to use arrow functions
+
+Use arrow functions when declaring temporary functions within other scopes. This can be within another function, or inside a method that expects a callback function (eg. `array.forEach()`).
+
+> **Reason**
+>
+> Arrow functions offer benefits about the ambiguity of the `this` keyword within other scopes, as they do not provide their own `this` context.
+>
+> Binding them to a variable, also makes it clear that this function only exists within said scope, just like any other scoped variable.
+
+### When to use anonymous functions
+
+When possible, use arrow functions instead.
+
+### Examples
+
+> **Do**
+>
+> ```js
+> // in myModules.js
+>
+> export function myFunction(parameter) {
+>     const addOne = (value) => {
+>         return value + 1;
+>     }
+>     // do more stuff...
+> }
+>
+> ```
+>
+> **Don't**
+>
+> ```js
+> // in myModules.js
+>
+> export const myFunction = (parameter) => {
+>     const addOne = function(value) {
+>         return value + 1;
+>     }
+>     // do more stuff...
+> }
+>
+> ```
+
+## HTML Multi-Line Layout
+
+Prettier tries to respect whitespace when formatting your HTML templates, even when it doesn't need to. So for example this code:
+
+```vue
+<b-button class="danger-button mb-4" variant="danger" @click="onDangerButtonClick">A very Long Button Text</b-button>
+```
+
+Might get turned into:
+
+```vue
+<b-button class="danger-button mb-4" variant="danger" @click="onDangerButtonClick"
+    >A very Long Button Text</b-button
+>
+```
+
+Notice the strange positioning of the `>` brackets.
+
+In this case the formatting is equivalent to the much more readable:
+
+```vue
+<b-button class="danger-button mb-4" variant="danger" @click="onDangerButtonClick">
+    A very Long Button Text
+</b-button>
+```
+
+Prettier does not know if our element has significant whitespace, or not. Check if your element has significant whitespace, and if it does not, reformat the HTML to avoid disjointed brackets.
+
+[Further reading about significant whitespace](https://developer.mozilla.org/en-US/docs/Web/API/Document_Object_Model/Whitespace)
+
+## Spacing
+
+Prettier doesn't add empty lines to your code, but they can help in making it more readable.
+
+### Javascript
+
+Add an empty line between a block of variable definitions and other code.
+
+> **Do**
+>
+> ```js
+> let a = 5;
+> let b = 6;
+>
+> console.log(a + b);
+> ```
+>
+> **Don't**
+>
+> ```js
+> let a = 5;
+> let b = 6;
+> console.log(a + b);
+> ```
+
+Add space between scopes.
+
+> **Do**
+>
+> ```js
+> function myFunction(parameter) {
+>     if (condition) {
+>         // do stuff...
+>     }
+>
+>     if (otherCondition) {
+>         // do more stuff...
+>     }
+> }
+>
+> function otherFunction() {
+>     // do other stuff...
+> }
+> ```
+>
+> **Don't**
+>
+> ```js
+> function myFunction(parameter) {
+>     if (condition) {
+>         // do stuff...
+>     }
+>     if (otherCondition) {
+>         // do more stuff...
+>     }
+> }
+> function otherFunction() {
+>     // do other stuff...
+> }
+> ```
+
+Add space between scopes and other code.
+
+> **Do**
+>
+> ```js
+> const myConstant = 5;
+>
+> if (myConstant === 5) {
+>     // do stuff...
+> }
+>
+> console.log("log stuff");
+> ```
+>
+> **Don't**
+>
+> ```js
+> const myConstant = 5;
+> if (myConstant === 5) {
+>     // do stuff...
+> }
+> console.log("log stuff");
+> ```
+
+### Vue Components
+
+Add spaces between the `script`, `template` and `style` blocks.
+
+> **Do**
+>
+> ```vue
+> <script setup>
+> // do stuff...
+> </script>
+>
+> <template>
+>     <!--template stuff-->
+> </template>
+>
+> <style lang="scss" scoped>
+> // stlye stuff...
+> </style>
+> ```
+>
+> **Don't**
+>
+> ```vue
+> <script setup>
+> // do stuff...
+> </script>
+> <template>
+>     <!--template stuff-->
+> </template>
+> <style lang="scss" scoped>
+> // stlye stuff...
+> </style>
+> ```
+
+### Vue Templates
+
+Do not add space between elements connected by conditionals.
+
+> **Do**
+>
+> ```vue
+> <div>
+>     <span v-if="conditional">
+>         condition met
+>     </span>
+>     <span v-else>
+>         condition not met
+>     </span>
+> </div>
+> ```
+>
+> **Don't**
+>
+> ```vue
+> <div>
+>     <span v-if="conditional">
+>         condition met
+>     </span>
+>
+>     <span v-else>
+>         condition not met
+>     </span>
+> </div>
+> ```
+
+Add space between non-connected elements.
+
+> **Do**
+>
+> ```vue
+> <div>
+>     <span>
+>         First span.
+>     </span>
+>
+>     <span>
+>         Second span.
+>     </span>
+> </div>
+> ```
+>
+> **Don't**
+>
+> ```vue
+> <div>
+>     <span>
+>         First span.
+>     </span>
+>     <span>
+>         Second span.
+>     </span>
+> </div>
+> ```
+
+Add space between logical blocks of elements.
+
+> **Do**
+>
+> ```vue
+> <div>
+>     <span v-if="conditional">
+>         condition 1 met
+>     </span>
+>     <span v-else>
+>         condition 1 not met
+>     </span>
+>
+>     <span v-if="otherConditional">
+>         condition 2 met
+>     </span>
+>     <span v-else>
+>         condition 2 not met
+>     </span>
+> </div>
+> ```
+>
+> **Don't**
+>
+> ```vue
+> <div>
+>     <span v-if="conditional">
+>         condition 1 met
+>     </span>
+>     <span v-else>
+>         condition 1 not met
+>     </span>
+>     <span v-if="otherConditional">
+>         condition 2 met
+>     </span>
+>     <span v-else>
+>         condition 2 not met
+>     </span>
+> </div>
+> ```
+
+## Casting
+
+Use explicit boolean casting.
+
+> **Do**
+>
+> ```js
+> const condition = Boolean(value);
+> ```
+>
+> **Don't**
+>
+> ```js
+> const condition = !!value;
+> ```
+
+> **Reason**
+>
+> `!!` is not an intentional casting operator. The casting is a side-effect of the `!` operator. Using explicit casting is easier to understand at a glance.
+
+## Equality
+
+When possible, use strict equality.
+
+> **Do**
+>
+> ```js
+> if (value === 5) {
+>     // do stuff...
+> }
+>
+> if (otherValue !== 6) {
+>     // do more stuff...
+> }
+> ```
+>
+> **Don't**
+>
+> ```js
+> if (value == 5) {
+>     // do stuff...
+> }
+>
+> if (otherValue != 6) {
+>     // do more stuff...
+> }
+> ```
+
+> **Reason**
+>
+> Strict equality simply checks if two values are equal. Loose equality does type conversion under the hood and is a lot more complicated. While in most cases these do the same, due to the added complexity of loose equality, there are some edge cases where loose equality (`==`) can lead to unexpected problems.
+>
+> For consistency, treat `===` as the default for equality checking.
+>
+> [Read more on MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Strict_equality)
+
+## Default value assignment
+
+Use `??` to assign default values.
+
+> **Do**
+>
+> ```js
+> const value = parameter ?? 0;
+> ```
+>
+> **Don't**
+>
+> ```js
+> const value = parameter || 0;
+> ```
+
+> **Reason**
+>
+> The `??` operator uses the right hand value, when the left hand one is unassigned (`undefined` or `null`), while `||` does this on all falsely values (eg. `false` or `0`). This can lead to unexpected bugs in edge cases.
+>
+> [Read more on MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Nullish_coalescing#assigning_a_default_value_to_a_variable)
+
+### Working with unused variables
+
+Unused variables are marked as errors in eslint, however when destructuring objects to remove
+certain keys you may be left with a variable you will not use further. You can
+name the unused variable `ignoredUnused`. The `no-unused-vars` config setting in `client/.eslintrc`
+contains `"varsIgnorePattern": "[iI]gnoreUnused.*"}` to ignore unused variables if they
+start with `ignoredUnused` or `IgnoredUnused`.
diff --git a/client/openapi_to_schema.mjs b/client/openapi_to_schema.mjs
new file mode 100644
index 00000000000..7c158e74413
--- /dev/null
+++ b/client/openapi_to_schema.mjs
@@ -0,0 +1,14 @@
+// this is a helper script that fixes const values
+// upstream fix in https://github.com/drwpow/openapi-typescript/pull/1014
+import openapiTS from "openapi-typescript";
+
+const inputFilePath = process.argv[2];
+
+const localPath = new URL(inputFilePath, import.meta.url);
+openapiTS(localPath, {
+    transform(schemaObject, metadata) {
+        if ("const" in schemaObject && schemaObject.type === "string") {
+            return `"${schemaObject.const}"`;
+        }
+    },
+}).then((output) => console.log(output));
diff --git a/client/package.json b/client/package.json
index 9f493a09502..777badca0eb 100644
--- a/client/package.json
+++ b/client/package.json
@@ -24,16 +24,19 @@
   "dependencies": {
     "@fontsource/atkinson-hyperlegible": "^4.5.10",
     "@fortawesome/fontawesome-free": "^5.15.4",
-    "@fortawesome/fontawesome-svg-core": "^1.2.36",
+    "@fortawesome/fontawesome-svg-core": "^6.2.1",
     "@fortawesome/free-brands-svg-icons": "^5.15.4",
     "@fortawesome/free-regular-svg-icons": "^5.15.4",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
-    "@fortawesome/vue-fontawesome": "^2.0.6",
-    "@handsontable/vue": "^2.0.0-beta1",
+    "@fortawesome/vue-fontawesome": "^2.0.9",
+    "@handsontable/vue": "^2.0.0",
     "@hirez_io/observer-spy": "^2.1.2",
     "@johmun/vue-tags-input": "^2.1.0",
+    "@pinia/testing": "^0.0.14",
     "@popperjs/core": "^2.11.5",
     "@sentry/browser": "^6.17.4",
+    "@types/d3": "^7.4.0",
+    "@vueuse/core": "^9.10.0",
     "assert": "^2.0.0",
     "axios": "^0.25.0",
     "babel-runtime": "^6.26.0",
@@ -43,7 +46,8 @@
     "citation-js": "^0.6.4",
     "core-js": "^3.21.0",
     "csv-parse": "^5.3.0",
-    "d3": "3",
+    "d3": "^7.8.0",
+    "d3-zoom": "^3.0.0",
     "date-fns": "^2.28.0",
     "date-fns-tz": "^1.3.3",
     "decode-uri-component": "^0.2.1",
@@ -53,7 +57,7 @@
     "file-saver": "^2.0.5",
     "flush-promises": "^1.0.2",
     "glob": "^7.2.0",
-    "handsontable": "^2.0.0",
+    "handsontable": "^4.0.0",
     "hsluv": "^0.1.0",
     "imask": "^6.4.0",
     "jquery": "2",
@@ -64,6 +68,7 @@
     "linkify-html": "^3.0.5",
     "linkifyjs": "^3.0.5",
     "localforage": "^1.10.0",
+    "lodash.isequal": "^4.5.0",
     "markdown-it": "^12.3.2",
     "markdown-it-regexp": "^0.4.0",
     "object-hash": "^3.0.0",
@@ -96,7 +101,7 @@
     "vue-prismjs": "^1.2.0",
     "vue-router": "^3.6.5",
     "vue-rx": "^6.2.0",
-    "vue-virtual-scroll-list": "^2.3.3",
+    "vue-virtual-scroll-list": "^2.3.4",
     "vuedraggable": "2.24.3",
     "vuex": "^3.6.2",
     "vuex-cache": "^3.4.0",
@@ -128,28 +133,23 @@
     "eslint": "eslint -c .eslintrc.json --ext .js,.vue,.ts src tests/jest/standalone"
   },
   "devDependencies": {
-    "@babel/core": "^7.18.9",
-    "@babel/eslint-parser": "^7.18.9",
-    "@babel/helper-validator-identifier": "^7.18.6",
+    "@babel/core": "^7.20.5",
+    "@babel/helper-validator-identifier": "^7.19.1",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.18.9",
-    "@babel/preset-env": "^7.18.9",
+    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/preset-env": "^7.20.2",
     "@babel/preset-typescript": "^7.18.6",
     "@cerner/duplicate-package-checker-webpack-plugin": "^2.3.0",
     "@testing-library/jest-dom": "^5.16.4",
-    "@typescript-eslint/eslint-plugin": "^5.43.0",
-    "@typescript-eslint/parser": "^5.43.0",
-    "@vue/test-utils": "^1.3.0",
+    "@typescript-eslint/eslint-plugin": "^5.45.1",
+    "@typescript-eslint/parser": "^5.45.1",
+    "@vue/test-utils": "^1.3.3",
     "@vue/tsconfig": "^0.1.3",
-    "@vue/vue2-jest": "^29.1.0",
+    "@vue/vue2-jest": "^29.2.1",
     "amdi18n-loader": "^0.9.3",
     "autoprefixer": "10.4.5",
     "axios-mock-adapter": "^1.20.0",
-    "babel-core": "^7.0.0-bridge.0",
-    "babel-jest": "^28.1.3",
-    "babel-loader": "^8.2.5",
-    "babel-plugin-transform-inline-environment-variables": "^0.4.4",
-    "babel-plugin-transform-vue-template": "^0.4.2",
+    "babel-jest": "^29.3.1",
     "buffer": "^6.0.3",
     "css-loader": "^6.7.1",
     "css-minimizer-webpack-plugin": "^4.0.0",
@@ -162,9 +162,9 @@
     "gulp": "^4.0.2",
     "ignore-loader": "^0.1.2",
     "imports-loader": "^4.0.0",
-    "jest": "^27.4.7",
+    "jest": "^29.3.1",
+    "jest-environment-jsdom": "^29.3.1",
     "jest-location-mock": "^1.0.9",
-    "jest-raw-loader": "^1.0.1",
     "json-loader": "^0.5.7",
     "karma": "^6.3.16",
     "karma-chrome-launcher": "^3.1.0",
@@ -184,6 +184,7 @@
     "style-loader": "^3.3.1",
     "ts-jest": "^29.0.3",
     "ts-loader": "^9.4.1",
+    "tsconfig-paths-webpack-plugin": "^4.0.0",
     "typescript": "^4.9.3",
     "typescript-eslint": "^0.0.1-alpha.0",
     "vue-loader": "^15.10.0",
diff --git a/client/src/app/galaxy.js b/client/src/app/galaxy.js
index 983503ed6ef..0b506a86abf 100644
--- a/client/src/app/galaxy.js
+++ b/client/src/app/galaxy.js
@@ -5,7 +5,7 @@ import BASE_MVC from "./base-mvc";
 import userModel from "./user-model";
 import metricsLogger from "utils/metrics-logger";
 import addLogging from "utils/add-logging";
-import localize from "utils/localization";
+import { localize, _setUserLocale, _getUserLocale } from "utils/localization";
 import { getGalaxyInstance } from "app";
 import { create, dialog } from "utils/data";
 
@@ -77,8 +77,8 @@ GalaxyApp.prototype._init = function (options, bootstrapped) {
     this._initUser(options.user || {});
     this.debug("GalaxyApp.user: ", this.user);
 
-    this.localize._setUserLocale(this.user, this.config);
-    this.localize._getUserLocale();
+    _setUserLocale(this.user, this.config);
+    _getUserLocale();
     this.debug("currentLocale: ", sessionStorage.getItem("currentLocale"));
 
     this._setUpListeners();
diff --git a/client/src/assets/images/largespinner.gif b/client/src/assets/images/largespinner.gif
deleted file mode 100644
index 3288d1035d7..00000000000
Binary files a/client/src/assets/images/largespinner.gif and /dev/null differ
diff --git a/client/src/bundleEntries.js b/client/src/bundleEntries.js
index fd41c060c12..a6a83d2a68c 100644
--- a/client/src/bundleEntries.js
+++ b/client/src/bundleEntries.js
@@ -20,7 +20,6 @@ export { SweepsterVisualization, SweepsterVisualizationView } from "viz/sweepste
 export { createTabularDatasetChunkedView } from "mvc/dataset/data";
 export { default as LegacyGridView } from "legacy/grid/grid-view";
 export { create_chart, create_histogram } from "reports/run_stats";
-export { openGlobalUploadModal } from "components/Upload";
 export { runTour } from "components/Tour/runTour";
 export { Toast } from "ui/toast"; // TODO: remove when external consumers are updated/gone (IES right now)
 
diff --git a/client/src/components/AboutGalaxy.vue b/client/src/components/AboutGalaxy.vue
index 774db0f8a35..5b5de240c3c 100644
--- a/client/src/components/AboutGalaxy.vue
+++ b/client/src/components/AboutGalaxy.vue
@@ -4,11 +4,11 @@
 
 import { computed } from "vue";
 
-import { getAppRoot } from "onload/loadConfig";
-import { useConfig } from "composables/config";
-import UtcDate from "components/UtcDate.vue";
-import License from "components/License/License.vue";
-import ExternalLink from "components/ExternalLink.vue";
+import { getAppRoot } from "@/onload/loadConfig";
+import { useConfig } from "@/composables/config";
+import UtcDate from "@/components/UtcDate.vue";
+import License from "@/components/License/License.vue";
+import ExternalLink from "@/components/ExternalLink.vue";
 
 const { config, isLoaded } = useConfig();
 
diff --git a/client/src/components/AvailableDatatypes/AvailableDatatypes.vue b/client/src/components/AvailableDatatypes/AvailableDatatypes.vue
index 079f9795680..ef876d343cf 100644
--- a/client/src/components/AvailableDatatypes/AvailableDatatypes.vue
+++ b/client/src/components/AvailableDatatypes/AvailableDatatypes.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
 import { ref } from "vue";
-import { useDetailedDatatypes } from "composables/datatypes";
-import { useFilterObjectArray } from "composables/utils/filter";
-import DelayedInput from "components/Common/DelayedInput.vue";
+import { useDetailedDatatypes, type DetailedDatatypes } from "@/composables/datatypes";
+import { useFilterObjectArray } from "@/composables/utils/filter";
+import DelayedInput from "@/components/Common/DelayedInput.vue";
 
 const filter = ref("");
-const filterFields = ["extension"];
+const filterFields: Array<keyof DetailedDatatypes> = ["extension"];
 
 const { datatypes } = useDetailedDatatypes();
 const filteredDatatypes = useFilterObjectArray(datatypes, filter, filterFields);
diff --git a/client/src/components/Citation/Citation.vue b/client/src/components/Citation/Citation.vue
index c41fcd12944..c6f62014996 100644
--- a/client/src/components/Citation/Citation.vue
+++ b/client/src/components/Citation/Citation.vue
@@ -2,9 +2,7 @@
     <div>
         {{ prefix }}
         <span v-html="citationHtml" />
-        <a v-if="link" :href="link" target="_blank">
-            <font-awesome-icon v-b-tooltip.hover title="View Citation" icon="external-link-alt" />
-        </a>
+        <a v-if="link" :href="link" target="_blank">Visit Citation <font-awesome-icon icon="external-link-alt" /> </a>
     </div>
 </template>
 
diff --git a/client/src/components/Common/ExportForm.test.js b/client/src/components/Common/ExportForm.test.js
index 77dd22a6255..83cb06d4d23 100644
--- a/client/src/components/Common/ExportForm.test.js
+++ b/client/src/components/Common/ExportForm.test.js
@@ -1,5 +1,5 @@
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import ExportForm from "./ExportForm.vue";
 
 const localVue = getLocalVue(true);
@@ -35,4 +35,35 @@ describe("ExportForm.vue", () => {
     it("should localize button text", async () => {
         expect(wrapper.find(".export-button").text()).toBeLocalizationOf("Export");
     });
+
+    it("should emit 'export' event with correct inputs on export button click", async () => {
+        await wrapper.setData({
+            name: "export.tar.gz",
+            directory: "gxfiles://",
+        });
+        expect(wrapper.emitted()).not.toHaveProperty("export");
+
+        await wrapper.find(".export-button").trigger("click");
+
+        expect(wrapper.emitted()).toHaveProperty("export");
+        expect(wrapper.emitted()["export"][0][0]).toBe("gxfiles://");
+        expect(wrapper.emitted()["export"][0][1]).toBe("export.tar.gz");
+    });
+
+    it("should clear the inputs after export when clearInputAfterExport is enabled", async () => {
+        await wrapper.setProps({
+            clearInputAfterExport: true,
+        });
+        await wrapper.setData({
+            name: "export.tar.gz",
+            directory: "gxfiles://",
+        });
+        expect(wrapper.vm.directory).toEqual("gxfiles://");
+        expect(wrapper.vm.name).toEqual("export.tar.gz");
+
+        await wrapper.find(".export-button").trigger("click");
+
+        expect(wrapper.vm.directory).toBe(null);
+        expect(wrapper.vm.name).toBe(null);
+    });
 });
diff --git a/client/src/components/Common/ExportForm.vue b/client/src/components/Common/ExportForm.vue
index 0dfc0019670..5c73d3366fe 100644
--- a/client/src/components/Common/ExportForm.vue
+++ b/client/src/components/Common/ExportForm.vue
@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="export-to-remote-file">
         <b-form-group
             id="fieldset-directory"
             label-for="directory"
@@ -32,6 +32,10 @@ export default {
             type: String,
             default: "archive",
         },
+        clearInputAfterExport: {
+            type: Boolean,
+            default: false,
+        },
     },
     data() {
         return {
@@ -59,6 +63,10 @@ export default {
     methods: {
         doExport() {
             this.$emit("export", this.directory, this.name);
+            if (this.clearInputAfterExport) {
+                this.directory = null;
+                this.name = null;
+            }
         },
     },
 };
diff --git a/client/src/components/Common/ExportRecordDetails.vue b/client/src/components/Common/ExportRecordDetails.vue
new file mode 100644
index 00000000000..8aa2e7e0cf7
--- /dev/null
+++ b/client/src/components/Common/ExportRecordDetails.vue
@@ -0,0 +1,127 @@
+<script setup>
+import { computed } from "vue";
+import { BAlert, BCard, BCardTitle } from "bootstrap-vue";
+import LoadingSpan from "components/LoadingSpan";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { faExclamationCircle, faExclamationTriangle, faCheckCircle, faClock } from "@fortawesome/free-solid-svg-icons";
+import { ExportRecordModel } from "./models/exportRecordModel";
+
+library.add(faExclamationCircle, faExclamationTriangle, faCheckCircle, faClock);
+
+const props = defineProps({
+    record: {
+        type: ExportRecordModel,
+        required: true,
+    },
+    objectType: {
+        type: String,
+        required: true,
+    },
+    actionMessage: {
+        type: String,
+        default: null,
+    },
+    actionMessageVariant: {
+        type: String,
+        default: "info",
+    },
+});
+
+const emit = defineEmits(["onReimport", "onDownload", "onActionMessageDismissed"]);
+
+const title = computed(() => (props.record.isReady ? `Exported` : `Export started`));
+const preparingMessage = computed(
+    () => `Preparing export. This may take some time depending on the size of your ${props.objectType}`
+);
+
+async function reimportObject() {
+    emit("onReimport", props.record);
+}
+
+function downloadObject() {
+    emit("onDownload", props.record);
+}
+
+function onMessageDismissed() {
+    emit("onActionMessageDismissed");
+}
+</script>
+
+<template>
+    <b-card class="export-record-details">
+        <b-card-title>
+            <b>{{ title }}</b> {{ props.record.elapsedTime }}
+        </b-card-title>
+        <p v-if="!props.record.isPreparing">
+            Format: <b class="record-archive-format">{{ props.record.modelStoreFormat }}</b>
+        </p>
+        <span v-if="props.record.isPreparing">
+            <loading-span :message="preparingMessage" />
+        </span>
+        <div v-else>
+            <div v-if="props.record.hasFailed">
+                <font-awesome-icon
+                    icon="exclamation-circle"
+                    class="text-danger record-failed-icon"
+                    title="Export failed" />
+                <span>
+                    Something failed during this export. Please try again and if the problem persist contact your
+                    administrator.
+                </span>
+                <b-alert show variant="danger">{{ props.record.errorMessage }}</b-alert>
+            </div>
+            <div v-else-if="props.record.isUpToDate" title="Up to date">
+                <font-awesome-icon icon="check-circle" class="text-success record-up-to-date-icon" />
+                <span> This export record contains the latest changes of the {{ props.objectType }}. </span>
+            </div>
+            <div v-else>
+                <font-awesome-icon icon="exclamation-triangle" class="text-warning record-outdated-icon" />
+                <span>
+                    This export is outdated and contains the changes of this {{ props.objectType }} from
+                    {{ props.record.elapsedTime }}.
+                </span>
+            </div>
+
+            <p v-if="props.record.canExpire" class="mt-3">
+                <span v-if="props.record.hasExpired">
+                    <font-awesome-icon icon="clock" class="text-danger record-expired-icon" /> This download link has
+                    expired.
+                </span>
+                <span v-else>
+                    <font-awesome-icon icon="clock" class="text-warning record-expiration-warning-icon" /> This download
+                    link expires {{ props.record.expirationElapsedTime }}.
+                </span>
+            </p>
+
+            <div v-if="props.record.isReady">
+                <p class="mt-3">You can do the following actions with this {{ props.objectType }} export:</p>
+                <b-alert
+                    v-if="props.actionMessage !== null"
+                    :variant="props.actionMessageVariant"
+                    show
+                    fade
+                    dismissible
+                    @dismissed="onMessageDismissed">
+                    {{ props.actionMessage }}
+                </b-alert>
+                <div v-else class="actions">
+                    <b-button
+                        v-if="props.record.canDownload"
+                        class="record-download-btn"
+                        variant="primary"
+                        @click="downloadObject">
+                        Download
+                    </b-button>
+                    <b-button
+                        v-if="props.record.canReimport"
+                        class="record-reimport-btn"
+                        variant="primary"
+                        @click="reimportObject">
+                        Reimport
+                    </b-button>
+                </div>
+            </div>
+        </div>
+    </b-card>
+</template>
diff --git a/client/src/components/Common/ExportRecordTable.vue b/client/src/components/Common/ExportRecordTable.vue
new file mode 100644
index 00000000000..9eb72a3e533
--- /dev/null
+++ b/client/src/components/Common/ExportRecordTable.vue
@@ -0,0 +1,130 @@
+<script setup>
+import { computed, ref } from "vue";
+import { BCard, BButton, BButtonGroup, BButtonToolbar, BCollapse, BTable, BLink } from "bootstrap-vue";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { library } from "@fortawesome/fontawesome-svg-core";
+import {
+    faExclamationCircle,
+    faCheckCircle,
+    faDownload,
+    faFileImport,
+    faSpinner,
+} from "@fortawesome/free-solid-svg-icons";
+
+library.add(faExclamationCircle, faCheckCircle, faDownload, faFileImport, faSpinner);
+
+const props = defineProps({
+    records: {
+        type: Array,
+        required: true,
+    },
+});
+
+const emit = defineEmits(["onReimport", "onDownload"]);
+
+const fields = [
+    { key: "elapsedTime", label: "Exported" },
+    { key: "format", label: "Format" },
+    { key: "expires", label: "Expires" },
+    { key: "isUpToDate", label: "Up to date", class: "text-center" },
+    { key: "isReady", label: "Ready", class: "text-center" },
+    { key: "actions", label: "Actions" },
+];
+
+const isExpanded = ref(false);
+const title = computed(() => (isExpanded.value ? `Hide export records` : `Show export records`));
+
+async function reimportObject(record) {
+    emit("onReimport", record);
+}
+
+function downloadObject(record) {
+    emit("onDownload", record);
+}
+</script>
+
+<template>
+    <div>
+        <b-link
+            :class="isExpanded ? null : 'collapsed'"
+            :aria-expanded="isExpanded ? 'true' : 'false'"
+            aria-controls="collapse-previous"
+            @click="isExpanded = !isExpanded">
+            {{ title }}
+        </b-link>
+        <b-collapse id="collapse-previous" v-model="isExpanded">
+            <b-card>
+                <b-table :items="props.records" :fields="fields">
+                    <template v-slot:cell(elapsedTime)="row">
+                        <span :title="row.item.date">{{ row.value }}</span>
+                    </template>
+                    <template v-slot:cell(format)="row">
+                        <span>{{ row.item.modelStoreFormat }}</span>
+                    </template>
+                    <template v-slot:cell(expires)="row">
+                        <span v-if="row.item.hasExpired">Expired</span>
+                        <span v-else-if="row.item.expirationDate" :title="row.item.expirationDate">{{
+                            row.item.expirationElapsedTime
+                        }}</span>
+                        <span v-else>No</span>
+                    </template>
+                    <template v-slot:cell(isUpToDate)="row">
+                        <font-awesome-icon
+                            v-if="row.item.isUpToDate"
+                            icon="check-circle"
+                            class="text-success"
+                            title="This export record contains the latest changes." />
+                        <font-awesome-icon
+                            v-else
+                            icon="exclamation-circle"
+                            class="text-danger"
+                            title="This export record is outdated. Please consider generating a new export if you need the latest changes." />
+                    </template>
+                    <template v-slot:cell(isReady)="row">
+                        <font-awesome-icon
+                            v-if="row.item.isReady"
+                            icon="check-circle"
+                            class="text-success"
+                            title="Ready to download or import." />
+                        <font-awesome-icon
+                            v-else-if="row.item.isPreparing"
+                            icon="spinner"
+                            spin
+                            class="text-info"
+                            title="Exporting in progress..." />
+                        <font-awesome-icon
+                            v-else-if="row.item.hasExpired"
+                            icon="exclamation-circle"
+                            class="text-danger"
+                            title="The export has expired." />
+                        <font-awesome-icon
+                            v-else
+                            icon="exclamation-circle"
+                            class="text-danger"
+                            title="The export failed." />
+                    </template>
+                    <template v-slot:cell(actions)="row">
+                        <b-button-toolbar aria-label="Actions">
+                            <b-button-group>
+                                <b-button
+                                    v-b-tooltip.hover.bottom
+                                    :disabled="!row.item.canDownload"
+                                    title="Download"
+                                    @click="downloadObject(row.item)">
+                                    <font-awesome-icon icon="download" />
+                                </b-button>
+                                <b-button
+                                    v-b-tooltip.hover.bottom
+                                    :disabled="!row.item.canReimport"
+                                    title="Reimport"
+                                    @click="reimportObject(row.item)">
+                                    <font-awesome-icon icon="file-import" />
+                                </b-button>
+                            </b-button-group>
+                        </b-button-toolbar>
+                    </template>
+                </b-table>
+            </b-card>
+        </b-collapse>
+    </div>
+</template>
diff --git a/client/src/components/Common/exportsMixin.test.js b/client/src/components/Common/exportsMixin.test.js
index 76ab1f86d9f..645cf6e37e3 100644
--- a/client/src/components/Common/exportsMixin.test.js
+++ b/client/src/components/Common/exportsMixin.test.js
@@ -1,5 +1,5 @@
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import exportsMixin from "./exportsMixin";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
diff --git a/client/src/components/Common/models/exportRecordModel.test.ts b/client/src/components/Common/models/exportRecordModel.test.ts
new file mode 100644
index 00000000000..f6119019ee3
--- /dev/null
+++ b/client/src/components/Common/models/exportRecordModel.test.ts
@@ -0,0 +1,61 @@
+import { ExportRecordModel } from "./exportRecordModel";
+import {
+    EXPECTED_EXPIRATION_DATE,
+    EXPIRED_STS_DOWNLOAD_RESPONSE,
+    FAILED_DOWNLOAD_RESPONSE,
+    FILE_SOURCE_STORE_RESPONSE,
+    RECENT_STS_DOWNLOAD_RESPONSE,
+} from "./testData/exportData";
+
+describe("ExportRecordModel", () => {
+    describe("STS Download Record", () => {
+        const stsDownloadRecord = new ExportRecordModel(RECENT_STS_DOWNLOAD_RESPONSE);
+
+        it("should be considered temporal (STS) when it has a short term storage ID defined", () => {
+            expect(stsDownloadRecord.isStsDownload).toBe(true);
+            expect(stsDownloadRecord.stsDownloadId).toBeTruthy();
+        });
+
+        it("should allow download when ready and not yet expired", () => {
+            expect(stsDownloadRecord.isReady).toBe(true);
+            expect(stsDownloadRecord.hasExpired).toBe(false);
+            expect(stsDownloadRecord.canDownload).toBe(true);
+        });
+    });
+
+    describe("Expired STS Download Record", () => {
+        const expiredDownloadRecord = new ExportRecordModel(EXPIRED_STS_DOWNLOAD_RESPONSE);
+
+        it("should calculate the correct expiration date", () => {
+            expect(expiredDownloadRecord.canExpire).toBe(true);
+            expect(expiredDownloadRecord.expirationDate).toStrictEqual(EXPECTED_EXPIRATION_DATE());
+        });
+
+        it("should not allow download when expired", () => {
+            expect(expiredDownloadRecord.hasExpired).toBe(true);
+            expect(expiredDownloadRecord.canDownload).toBe(false);
+            expect(expiredDownloadRecord.isReady).toBe(false);
+        });
+    });
+
+    describe("Failed STS Download Record", () => {
+        const failedDownloadRecord = new ExportRecordModel(FAILED_DOWNLOAD_RESPONSE);
+
+        it("should not be downloadable", () => {
+            expect(failedDownloadRecord.isReady).toBe(false);
+            expect(failedDownloadRecord.isPreparing).toBe(false);
+            expect(failedDownloadRecord.hasExpired).toBe(false);
+            expect(failedDownloadRecord.canDownload).toBe(false);
+        });
+    });
+
+    describe("File Source Storage Record", () => {
+        const failedDownloadRecord = new ExportRecordModel(FILE_SOURCE_STORE_RESPONSE);
+
+        it("should be importable", () => {
+            expect(failedDownloadRecord.isReady).toBe(true);
+            expect(failedDownloadRecord.canReimport).toBe(true);
+            expect(failedDownloadRecord.importUri).toBeTruthy();
+        });
+    });
+});
diff --git a/client/src/components/Common/models/exportRecordModel.ts b/client/src/components/Common/models/exportRecordModel.ts
new file mode 100644
index 00000000000..6c9f6c3f0e3
--- /dev/null
+++ b/client/src/components/Common/models/exportRecordModel.ts
@@ -0,0 +1,148 @@
+import { formatDistanceToNow, parseISO } from "date-fns";
+import type { components } from "@/schema";
+
+type ExportObjectRequestMetadata = components["schemas"]["ExportObjectRequestMetadata"];
+
+export type StoreExportPayload = components["schemas"]["StoreExportPayload"];
+export type ObjectExportTaskResponse = components["schemas"]["ObjectExportTaskResponse"];
+
+export class ExportParamsModel {
+    private _params: StoreExportPayload;
+    constructor(data: StoreExportPayload = {}) {
+        this._params = data;
+    }
+
+    get modelStoreFormat() {
+        return this._params?.model_store_format;
+    }
+
+    get includeFiles() {
+        return this._params?.include_files;
+    }
+
+    get includeDeleted() {
+        return this._params?.include_deleted;
+    }
+
+    get includeHidden() {
+        return this._params?.include_hidden;
+    }
+
+    public equals(otherExportParams?: ExportParamsModel) {
+        if (!otherExportParams) {
+            return false;
+        }
+        return (
+            this.modelStoreFormat === otherExportParams.modelStoreFormat &&
+            this.includeFiles === otherExportParams.includeFiles &&
+            this.includeDeleted === otherExportParams.includeDeleted &&
+            this.includeHidden === otherExportParams.includeHidden
+        );
+    }
+}
+
+export class ExportRecordModel {
+    private _data: ObjectExportTaskResponse;
+    private _expirationDate?: Date | null;
+    private _requestMetadata?: ExportObjectRequestMetadata;
+    private _exportParameters?: ExportParamsModel;
+
+    constructor(data: ObjectExportTaskResponse) {
+        this._data = data;
+        this._expirationDate = undefined;
+        this._requestMetadata = data.export_metadata?.request_data;
+        this._exportParameters = this._requestMetadata?.payload
+            ? new ExportParamsModel(this._requestMetadata?.payload)
+            : undefined;
+    }
+
+    get isReady() {
+        return (this._data.ready && !this.hasExpired) ?? false;
+    }
+
+    get isPreparing() {
+        return this._data.preparing ?? false;
+    }
+
+    get isUpToDate() {
+        return this._data.up_to_date ?? false;
+    }
+
+    get hasFailed() {
+        return !this.isReady && !this.isPreparing && !this.hasExpired;
+    }
+
+    get date() {
+        return parseISO(`${this._data.create_time}Z`);
+    }
+
+    get elapsedTime() {
+        return formatDistanceToNow(this.date, { addSuffix: true });
+    }
+
+    get taskUUID() {
+        return this._data.task_uuid;
+    }
+
+    get importUri() {
+        const payload = this._requestMetadata?.payload;
+        return payload && "target_uri" in payload ? payload.target_uri : undefined;
+    }
+
+    get canReimport() {
+        return this.isReady && Boolean(this.importUri);
+    }
+
+    get stsDownloadId() {
+        const payload = this._requestMetadata?.payload;
+        return payload && "short_term_storage_request_id" in payload
+            ? payload.short_term_storage_request_id
+            : undefined;
+    }
+
+    get isStsDownload() {
+        return Boolean(this.stsDownloadId);
+    }
+
+    get canDownload() {
+        return this.isReady && this.isStsDownload && !this.hasExpired;
+    }
+
+    get modelStoreFormat() {
+        return this.exportParams?.modelStoreFormat;
+    }
+
+    get exportParams() {
+        return this._exportParameters;
+    }
+
+    get duration() {
+        const payload = this._requestMetadata?.payload;
+        return payload && "duration" in payload ? payload.duration : undefined;
+    }
+
+    get canExpire() {
+        return this.isStsDownload && Boolean(this.duration);
+    }
+
+    get expirationDate() {
+        if (this._expirationDate === undefined) {
+            this._expirationDate = this.duration ? new Date(this.date.getTime() + this.duration * 1000) : null;
+        }
+        return this._expirationDate;
+    }
+
+    get expirationElapsedTime() {
+        return this.canExpire && this.expirationDate
+            ? formatDistanceToNow(this.expirationDate, { addSuffix: true })
+            : null;
+    }
+
+    get hasExpired() {
+        return this.canExpire && this.expirationDate && Date.now() > this.expirationDate.getTime();
+    }
+
+    get errorMessage() {
+        return this._data?.export_metadata?.result_data?.error;
+    }
+}
diff --git a/client/src/components/Common/models/testData/exportData.ts b/client/src/components/Common/models/testData/exportData.ts
new file mode 100644
index 00000000000..419af7290d3
--- /dev/null
+++ b/client/src/components/Common/models/testData/exportData.ts
@@ -0,0 +1,108 @@
+import { ExportRecordModel } from "@/components/Common/models/exportRecordModel";
+import type { components } from "@/schema";
+
+type ObjectExportTaskResponse = components["schemas"]["ObjectExportTaskResponse"];
+type ExportObjectRequestMetadata = components["schemas"]["ExportObjectRequestMetadata"];
+type ExportObjectResultMetadata = components["schemas"]["ExportObjectResultMetadata"];
+
+const PAST_EXPORT_DATE = new Date("11 November 2022 14:48 UTC").toISOString();
+const RECENT_EXPORT_DATE = new Date().toISOString();
+const STS_EXPORT_DURATION_IN_SECONDS = 86400;
+export const EXPECTED_EXPIRATION_DATE = () => {
+    const expectedDate = new Date(PAST_EXPORT_DATE);
+    expectedDate.setSeconds(expectedDate.getSeconds() + STS_EXPORT_DURATION_IN_SECONDS);
+    return expectedDate;
+};
+
+const FAKE_STS_DOWNLOAD_REQUEST_DATA: ExportObjectRequestMetadata = {
+    object_id: "3cc0effd29705aa3",
+    object_type: "history",
+    user_id: "f597429621d6eb2b",
+    payload: {
+        model_store_format: "rocrate.zip",
+        include_files: true,
+        include_deleted: false,
+        include_hidden: false,
+        short_term_storage_request_id: "08bf4cc3-758e-4a9d-9fe4-a89a0d0604c7",
+        duration: STS_EXPORT_DURATION_IN_SECONDS,
+    },
+};
+
+const FAKE_FILE_SOURCE_REQUEST_DATA: ExportObjectRequestMetadata = {
+    object_id: "3cc0effd29705aa3",
+    object_type: "history",
+    user_id: "f597429621d6eb2b",
+    payload: {
+        model_store_format: "tar.gz",
+        include_files: true,
+        include_deleted: false,
+        include_hidden: false,
+        target_uri: "gxfiles://fake-target-uri/test.tar.gz",
+    },
+};
+
+const SUCCESS_EXPORT_RESULT_DATA: ExportObjectResultMetadata = {
+    success: true,
+    error: undefined,
+};
+
+const FAILED_EXPORT_RESULT_DATA: ExportObjectResultMetadata = {
+    success: false,
+    error: "Fake Error Message",
+};
+
+export const RECENT_STS_DOWNLOAD_RESPONSE: ObjectExportTaskResponse = {
+    id: "FAKE_RECENT_DOWNLOAD_ID",
+    ready: true,
+    preparing: false,
+    up_to_date: true,
+    task_uuid: "35563335-e275-4520-80e8-885793279095",
+    create_time: RECENT_EXPORT_DATE,
+    export_metadata: {
+        request_data: FAKE_STS_DOWNLOAD_REQUEST_DATA,
+        result_data: SUCCESS_EXPORT_RESULT_DATA,
+    },
+};
+
+export const EXPIRED_STS_DOWNLOAD_RESPONSE: ObjectExportTaskResponse = {
+    id: "FAKE_EXPIRED_DOWNLOAD_ID",
+    ready: true,
+    preparing: false,
+    up_to_date: true,
+    task_uuid: "35563335-e275-4520-80e8-885793279095",
+    create_time: PAST_EXPORT_DATE,
+    export_metadata: {
+        request_data: FAKE_STS_DOWNLOAD_REQUEST_DATA,
+        result_data: SUCCESS_EXPORT_RESULT_DATA,
+    },
+};
+
+export const FAILED_DOWNLOAD_RESPONSE: ObjectExportTaskResponse = {
+    id: "FAKE_FAILED_DOWNLOAD_ID",
+    ready: false,
+    preparing: false,
+    up_to_date: true,
+    task_uuid: "35563335-e275-4520-80e8-885793279095",
+    create_time: RECENT_EXPORT_DATE,
+    export_metadata: {
+        request_data: FAKE_STS_DOWNLOAD_REQUEST_DATA,
+        result_data: FAILED_EXPORT_RESULT_DATA,
+    },
+};
+
+export const FILE_SOURCE_STORE_RESPONSE: ObjectExportTaskResponse = {
+    id: "FAKE_RECENT_DOWNLOAD_ID",
+    ready: true,
+    preparing: false,
+    up_to_date: true,
+    task_uuid: "35563335-e275-4520-80e8-885793279095",
+    create_time: RECENT_EXPORT_DATE,
+    export_metadata: {
+        request_data: FAKE_FILE_SOURCE_REQUEST_DATA,
+        result_data: SUCCESS_EXPORT_RESULT_DATA,
+    },
+};
+
+export const EXPIRED_STS_DOWNLOAD_RECORD = new ExportRecordModel(EXPIRED_STS_DOWNLOAD_RESPONSE);
+export const FILE_SOURCE_STORE_RECORD = new ExportRecordModel(FILE_SOURCE_STORE_RESPONSE);
+export const RECENT_STS_DOWNLOAD_RECORD = new ExportRecordModel(RECENT_STS_DOWNLOAD_RESPONSE);
diff --git a/client/src/components/DataDialog/DataDialog.vue b/client/src/components/DataDialog/DataDialog.vue
index e2e73ec52a7..fcb6fe3654c 100644
--- a/client/src/components/DataDialog/DataDialog.vue
+++ b/client/src/components/DataDialog/DataDialog.vue
@@ -46,7 +46,7 @@ import { UrlTracker } from "./utilities";
 import { Model } from "./model";
 import { Services } from "./services";
 import { getAppRoot } from "onload/loadConfig";
-import { mountUploadModal } from "components/Upload";
+import { useGlobalUploadModal } from "composables/globalUploadModal";
 
 Vue.use(BootstrapVue);
 
@@ -78,6 +78,10 @@ export default {
             default: true,
         },
     },
+    setup() {
+        const { openGlobalUploadModal } = useGlobalUploadModal();
+        return { openGlobalUploadModal };
+    },
     data() {
         return {
             errorMessage: null,
@@ -133,7 +137,7 @@ export default {
                 modalShow: true,
                 selectable: true,
             };
-            mountUploadModal(propsData);
+            this.openGlobalUploadModal(propsData);
             this.modalShow = false;
         },
         /** Called when selection is complete, values are formatted and parsed to external callback **/
diff --git a/client/src/components/Dataset/DatasetName.test.js b/client/src/components/Dataset/DatasetName.test.js
index 0c6cc02968e..2a2e9062081 100644
--- a/client/src/components/Dataset/DatasetName.test.js
+++ b/client/src/components/Dataset/DatasetName.test.js
@@ -1,6 +1,6 @@
 import { shallowMount } from "@vue/test-utils";
 import DatasetName from "./DatasetName";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 
 const localVue = getLocalVue();
 
diff --git a/client/src/components/Dataset/DatasetStorage/DatasetStorage.test.js b/client/src/components/Dataset/DatasetStorage/DatasetStorage.test.js
index e497c401d75..82112654392 100644
--- a/client/src/components/Dataset/DatasetStorage/DatasetStorage.test.js
+++ b/client/src/components/Dataset/DatasetStorage/DatasetStorage.test.js
@@ -1,6 +1,6 @@
 import { shallowMount } from "@vue/test-utils";
 import DatasetStorage from "./DatasetStorage";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import flushPromises from "flush-promises";
 import MockAdapter from "axios-mock-adapter";
 import axios from "axios";
diff --git a/client/src/components/Dataset/services.ts b/client/src/components/Dataset/services.ts
index 33d976e3318..d47b20d578b 100644
--- a/client/src/components/Dataset/services.ts
+++ b/client/src/components/Dataset/services.ts
@@ -1,6 +1,6 @@
-import { fetcher } from "schema";
-import { safePath } from "utils/redirect";
 import type { FetchArgType } from "openapi-typescript-fetch";
+import { fetcher } from "@/schema";
+import { withPrefix } from "@/utils/redirect";
 
 const _getDatasets = fetcher.path("/api/datasets").method("get").create();
 type GetDatasetsApiOptions = FetchArgType<typeof _getDatasets>;
@@ -17,7 +17,7 @@ export async function getDatasets(options: GetDatasetsOptions = {}) {
     const params: GetDatasetsApiOptions = {};
     if (options.sortBy) {
         const sortPrefix = options.sortDesc ? "-dsc" : "-asc";
-        params.order = `${options.sortBy}${sortPrefix}&`;
+        params.order = `${options.sortBy}${sortPrefix}`;
     }
     if (options.limit) {
         params.limit = options.limit;
@@ -67,7 +67,7 @@ export async function updateTags(
 
 export function getCompositeDatasetLink(historyDatasetId: string, path: string) {
     // TODO: historyDatasetId is wrong here, we should expose the route without forcing to provide a history id
-    return safePath(`/api/histories/${historyDatasetId}/contents/${historyDatasetId}/display?filename=${path}`);
+    return withPrefix(`/api/histories/${historyDatasetId}/contents/${historyDatasetId}/display?filename=${path}`);
 }
 
 const getDataset = fetcher.path("/api/histories/{history_id}/contents/{id}").method("get").create();
diff --git a/client/src/components/DatasetInformation/DatasetAttributes.test.js b/client/src/components/DatasetInformation/DatasetAttributes.test.js
index 59b85428df9..97bd9d9fed2 100644
--- a/client/src/components/DatasetInformation/DatasetAttributes.test.js
+++ b/client/src/components/DatasetInformation/DatasetAttributes.test.js
@@ -1,6 +1,6 @@
 import axios from "axios";
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import DatasetAttributes from "./DatasetAttributes";
 import MockProvider from "../providers/MockProvider";
 import MockAdapter from "axios-mock-adapter";
diff --git a/client/src/components/DatasetInformation/DatasetDetails.vue b/client/src/components/DatasetInformation/DatasetDetails.vue
index 9c202627343..b8a7dfdb10f 100644
--- a/client/src/components/DatasetInformation/DatasetDetails.vue
+++ b/client/src/components/DatasetInformation/DatasetDetails.vue
@@ -4,7 +4,7 @@
             :id="datasetId"
             v-slot="{ result: dataset, loading: isDatasetLoading, error: datasetLoadingError }">
             <div aria-labelledby="dataset-details-heading">
-                <h1 id="dataset-details-heading" class="hide-element">Dataset Details</h1>
+                <h1 id="dataset-details-heading" class="sr-only">Dataset Details</h1>
                 <LoadingSpan v-if="isDatasetLoading" />
                 <Alert v-else-if="datasetLoadingError" :message="datasetLoadingError" variant="error" />
                 <CurrentUser v-else v-slot="{ user }">
diff --git a/client/src/components/DatasetInformation/DatasetError.test.js b/client/src/components/DatasetInformation/DatasetError.test.js
index 39c8b513a29..2bda611fec3 100644
--- a/client/src/components/DatasetInformation/DatasetError.test.js
+++ b/client/src/components/DatasetInformation/DatasetError.test.js
@@ -1,7 +1,8 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import DatasetError from "./DatasetError";
 import MockProvider from "../providers/MockProvider";
+import MockCurrentUser from "../providers/MockCurrentUser";
 
 jest.mock("components/providers", () => {
     return {}; // stubbed below
@@ -33,6 +34,7 @@ function buildWrapper(has_duplicate_inputs = true, has_empty_inputs = true, user
             }),
             FontAwesomeIcon: false,
             FormElement: false,
+            CurrentUser: MockCurrentUser({ email: "email" }),
         },
     });
 }
@@ -48,7 +50,6 @@ describe("DatasetError", () => {
         expect(messages.at(1).text()).toBe("message_2");
         expect(wrapper.find("#dataset-error-has-empty-inputs")).toBeDefined();
         expect(wrapper.find("#dataset-error-has-duplicate-inputs")).toBeDefined();
-        expect(wrapper.findAll("#dataset-error-email").length).toBe(1);
     });
 
     it("check props without common problems", async () => {
diff --git a/client/src/components/DatasetInformation/DatasetError.vue b/client/src/components/DatasetInformation/DatasetError.vue
index 29b1888a052..001bb403e0a 100644
--- a/client/src/components/DatasetInformation/DatasetError.vue
+++ b/client/src/components/DatasetInformation/DatasetError.vue
@@ -61,25 +61,25 @@
                         show
                         >{{ resultMessage[0] }}</b-alert
                     >
-                    <div v-if="showForm" id="fieldsAndButton">
-                        <FormElement
-                            v-if="!jobDetails.user_email"
-                            id="dataset-error-email"
-                            v-model="email"
-                            title="Please provide your email:" />
-                        <FormElement
-                            id="dataset-error-message"
-                            v-model="message"
-                            :area="true"
-                            title="Please provide detailed information on the activities leading to this issue:" />
-                        <b-button
-                            id="dataset-error-submit"
-                            variant="primary"
-                            class="mt-3"
-                            @click="submit(dataset, jobDetails.user_email)">
-                            <font-awesome-icon icon="bug" class="mr-1" />Report
-                        </b-button>
-                    </div>
+                    <CurrentUser v-slot="{ user }">
+                        <div v-if="showForm" id="fieldsAndButton">
+                            <span class="mr-2 font-weight-bold">{{ emailTitle }}</span>
+                            <span v-if="!!user.email">{{ user.email }}</span>
+                            <span v-else>{{ "You must be logged in to receive emails" | l }}</span>
+                            <FormElement
+                                id="dataset-error-message"
+                                v-model="message"
+                                :area="true"
+                                title="Please provide detailed information on the activities leading to this issue:" />
+                            <b-button
+                                id="dataset-error-submit"
+                                variant="primary"
+                                class="mt-3"
+                                @click="submit(dataset, jobDetails.user_email)">
+                                <font-awesome-icon icon="bug" class="mr-1" />Report
+                            </b-button>
+                        </div>
+                    </CurrentUser>
                 </div>
             </JobDetailsProvider>
         </DatasetProvider>
@@ -95,6 +95,7 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { faBug } from "@fortawesome/free-solid-svg-icons";
 import { sendErrorReport } from "./services";
+import CurrentUser from "components/providers/CurrentUser";
 
 library.add(faBug);
 
@@ -106,6 +107,7 @@ export default {
         FormElement,
         JobDetailsProvider,
         JobProblemProvider,
+        CurrentUser,
     },
     props: {
         datasetId: {
@@ -116,9 +118,9 @@ export default {
     data() {
         return {
             message: null,
-            email: null,
             errorMessage: null,
             resultMessages: [],
+            emailTitle: this.l("Your email address"),
         };
     },
     computed: {
@@ -132,8 +134,8 @@ export default {
         onError(err) {
             this.errorMessage = err;
         },
-        submit(dataset, userEmail) {
-            const email = this.email || userEmail;
+        submit(dataset, userEmailJob) {
+            const email = userEmailJob || this.currentUserEmail;
             const message = this.message;
             sendErrorReport(dataset, message, email).then(
                 (resultMessages) => {
diff --git a/client/src/components/DatasetInformation/DatasetInformation.test.js b/client/src/components/DatasetInformation/DatasetInformation.test.js
index 5a8ade80420..84ef036a478 100644
--- a/client/src/components/DatasetInformation/DatasetInformation.test.js
+++ b/client/src/components/DatasetInformation/DatasetInformation.test.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import DatasetInformation from "./DatasetInformation";
 import datasetResponse from "./testData/datasetResponse";
 import flushPromises from "flush-promises";
diff --git a/client/src/components/Datatypes/model.ts b/client/src/components/Datatypes/model.ts
index 6b1551b2d93..8d1e47f82bc 100644
--- a/client/src/components/Datatypes/model.ts
+++ b/client/src/components/Datatypes/model.ts
@@ -1,4 +1,4 @@
-import type { components } from "schema";
+import type { components } from "@/schema";
 
 export type DatatypesCombinedMap = components["schemas"]["DatatypesCombinedMap"];
 
diff --git a/client/src/components/Datatypes/services.ts b/client/src/components/Datatypes/services.ts
index 9ae24e8525e..59f98475768 100644
--- a/client/src/components/Datatypes/services.ts
+++ b/client/src/components/Datatypes/services.ts
@@ -1,4 +1,4 @@
-import { fetcher } from "schema/fetcher";
+import { fetcher } from "@/schema/fetcher";
 
 const getTypesAndMappings = fetcher.path("/api/datatypes/types_and_mapping").method("get").create();
 
diff --git a/client/src/components/Form/Elements/FormBoolean.test.js b/client/src/components/Form/Elements/FormBoolean.test.js
index 5e7855ee44f..16629137fbc 100644
--- a/client/src/components/Form/Elements/FormBoolean.test.js
+++ b/client/src/components/Form/Elements/FormBoolean.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import FormBoolean from "./FormBoolean";
 
 const localVue = getLocalVue();
@@ -18,13 +18,17 @@ describe("FormBoolean", () => {
 
     it("check initial value and value change", async () => {
         const input = wrapper.find("input");
-        expect(wrapper.vm.currentValue).toBe(false);
-        await wrapper.setProps({ value: true });
-        expect(wrapper.vm.currentValue).toBe(true);
-        await input.trigger("click");
-        expect(input.element.checked).toBe(false);
-        await input.trigger("click");
-        expect(input.element.checked).toBe(true);
+        const switchComponent = wrapper.findComponent(".custom-switch");
+        expect(switchComponent.props().value).toBe(false);
+        await wrapper.setProps({ value: "true" });
         expect(wrapper.emitted().input[0][0]).toBe(true);
+        await wrapper.setProps({ value: "false" });
+        expect(wrapper.emitted().input[1][0]).toBe(false);
+        await wrapper.setProps({ value: true });
+        expect(wrapper.emitted().input[2][0]).toBe(true);
+        await input.setChecked(false);
+        expect(wrapper.emitted().input[3][0]).toBe(false);
+        await input.setChecked(true);
+        expect(wrapper.emitted().input[4][0]).toBe(true);
     });
 });
diff --git a/client/src/components/Form/Elements/FormBoolean.vue b/client/src/components/Form/Elements/FormBoolean.vue
index 8784035c5c5..c2a30124d2f 100644
--- a/client/src/components/Form/Elements/FormBoolean.vue
+++ b/client/src/components/Form/Elements/FormBoolean.vue
@@ -1,28 +1,29 @@
+<script setup lang="ts">
+import { computed } from "vue";
+
+export interface FormBooleanProps {
+    value: boolean | string;
+}
+
+const props = defineProps<FormBooleanProps>();
+const emit = defineEmits<{
+    (e: "input", value: boolean): void;
+}>();
+
+const currentValue = computed({
+    get() {
+        return String(props.value).toLowerCase() === "true";
+    },
+    set(newValue) {
+        emit("input", newValue);
+    },
+});
+
+const label = computed(() => (currentValue.value ? "Yes" : "No"));
+</script>
+
 <template>
     <b-form-checkbox v-model="currentValue" class="no-highlight" switch>
         {{ label }}
     </b-form-checkbox>
 </template>
-
-<script>
-export default {
-    props: {
-        value: {
-            required: true,
-        },
-    },
-    computed: {
-        currentValue: {
-            get() {
-                return ["true", true].includes(this.value);
-            },
-            set(val) {
-                this.$emit("input", val);
-            },
-        },
-        label() {
-            return this.currentValue ? "Yes" : "No";
-        },
-    },
-};
-</script>
diff --git a/client/src/components/Form/Elements/FormCheck.test.js b/client/src/components/Form/Elements/FormCheck.test.js
new file mode 100644
index 00000000000..87c2829c6ce
--- /dev/null
+++ b/client/src/components/Form/Elements/FormCheck.test.js
@@ -0,0 +1,91 @@
+import { mount } from "@vue/test-utils";
+import { getLocalVue } from "tests/jest/helpers";
+import MountTarget from "./FormCheck";
+
+const localVue = getLocalVue(true);
+
+describe("FormCheck", () => {
+    let wrapper;
+
+    beforeEach(() => {
+        wrapper = mount(MountTarget, {
+            propsData: {
+                value: null,
+                options: [],
+            },
+            localVue,
+        });
+    });
+
+    it("Confirm 'n + 1' checkboxes created (eg. includes the Select-All). Confirm labels and values match. Confirm correct values emitted.", async () => {
+        const noInput = wrapper.find("[type='checkbox']");
+        expect(noInput.exists()).toBe(false);
+        const n = 3;
+        const options = [];
+        for (let i = 0; i < n; i++) {
+            options.push([`label_${i}`, `value_${i}`]);
+        }
+        await wrapper.setProps({ options });
+        const inputs = wrapper.findAll("[type='checkbox']");
+        const labels = wrapper.findAll(".custom-control-label");
+        expect(inputs.length).toBe(n + 1);
+        const expectedValues = [];
+        for (let i = 0; i < n; i++) {
+            await inputs.at(i + 1).setChecked();
+            expect(labels.at(i + 1).text()).toBe(`label_${i}`);
+            expect(inputs.at(i + 1).attributes("value")).toBe(`value_${i}`);
+            expectedValues.push(`value_${i}`);
+            expect(wrapper.emitted()["input"][i][0]).toEqual(expectedValues);
+        }
+    });
+
+    it("Confirm checkboxes are created when various 'empty values' are passed.", async () => {
+        const emptyValues = [0, null, false, true, undefined];
+        const options = [];
+        for (let i = 0; i < emptyValues.length; i++) {
+            options.push([`label_${i}`, emptyValues[i]]);
+        }
+        await wrapper.setProps({ options });
+        const inputs = wrapper.findAll("[type='checkbox']");
+        expect(inputs.length).toBe(emptyValues.length + 1);
+        const expectedValues = [];
+        for (let i = 0; i < emptyValues; i++) {
+            await inputs.at(i + 1).setChecked();
+            expect(inputs.at(i + 1).attributes("value")).toBe(emptyValues[i]);
+            expectedValues.push(expectedValues[i]);
+            expect(wrapper.emitted()["input"][i][0]).toEqual(expectedValues);
+        }
+    });
+
+    it("Confirm Select-All checkbox works in various states: select-all, unselect-all, indeterminate/partial-list-selection.", async () => {
+        const n = 3;
+        const options = [];
+        for (let i = 0; i < n; i++) {
+            options.push([`label_${i}`, `value_${i}`]);
+        }
+        await wrapper.setProps({ options });
+        const inputs = wrapper.findAll("[type='checkbox']");
+        /* confirm number of checkboxes requested matches number checkboxes created */
+        expect(inputs.length).toBe(n + 1);
+        /* confirm component loads unchecked */
+        for (let i = 0; i < n + 1; i++) {
+            expect(inputs.at(i).element.checked).toBeFalsy();
+        }
+        /* 1 - confirm select-all option checked */
+        await inputs.at(0).setChecked();
+        expect(inputs.at(0).element.checked).toBeTruthy();
+        /* ...confirm corresponding options checked */
+        const values = options.map((option) => option[1]);
+        expect(wrapper.emitted()["input"][0][0]).toStrictEqual(values);
+        /* 2 - confirm select-all option UNchecked */
+        await inputs.at(0).setChecked(false);
+        expect(inputs.at(0).element.checked).toBeFalsy();
+        /* ...confirm corresponding options UNchecked */
+        for (let i = 0; i < n; i++) {
+            expect(inputs.at(i + 1).element.checked).toBeFalsy();
+        }
+        /* 3 - confirm corresponding options indeterminate-state */
+        await inputs.at(1).setChecked(true);
+        expect(wrapper.find("input:indeterminate").exists()).toBe(true);
+    });
+});
diff --git a/client/src/components/Form/Elements/FormCheck.vue b/client/src/components/Form/Elements/FormCheck.vue
new file mode 100644
index 00000000000..2450e623170
--- /dev/null
+++ b/client/src/components/Form/Elements/FormCheck.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import { computed, ref } from "vue";
+
+export interface FormCheckProps {
+    value?: string | string[];
+    options: string[];
+}
+
+const props = defineProps<FormCheckProps>();
+
+const emit = defineEmits<{
+    (e: "input", value: string[]): void;
+}>();
+
+const indeterminate = ref(false);
+
+const currentValue = computed({
+    get: () => {
+        const val = props.value ?? [];
+        return Array.isArray(val) ? val : [val];
+    },
+    set: (newValue) => {
+        emit("input", newValue);
+
+        if (newValue.length === 0) {
+            selectAll.value = false;
+            indeterminate.value = false;
+        } else if (newValue.length === props.options.length) {
+            selectAll.value = true;
+            indeterminate.value = false;
+        } else {
+            indeterminate.value = true;
+        }
+    },
+});
+
+const hasOptions = computed(() => {
+    return props.options.length > 0;
+});
+
+const selectAll = ref(false);
+
+function onSelectAll() {
+    if (selectAll.value) {
+        const allValues = props.options.map((option) => option[1]);
+        emit("input", allValues);
+    } else {
+        emit("input", []);
+    }
+}
+</script>
+
+<template>
+    <div v-if="hasOptions">
+        <b-form-checkbox
+            v-model="selectAll"
+            v-localize
+            class="mb-1"
+            :indeterminate="indeterminate"
+            @input="onSelectAll">
+            Select / Deselect all
+        </b-form-checkbox>
+
+        <b-form-checkbox-group v-model="currentValue" stacked class="pl-3">
+            <b-form-checkbox v-for="(option, index) in options" :key="index" :value="option[1]">
+                {{ option[0] }}
+            </b-form-checkbox>
+        </b-form-checkbox-group>
+    </div>
+    <b-alert v-else v-localize variant="warning" show> No options available. </b-alert>
+</template>
diff --git a/client/src/components/Form/Elements/FormColor.vue b/client/src/components/Form/Elements/FormColor.vue
index 31e3156aa37..6bb30b94245 100644
--- a/client/src/components/Form/Elements/FormColor.vue
+++ b/client/src/components/Form/Elements/FormColor.vue
@@ -1,3 +1,29 @@
+<script setup lang="ts">
+import { computed } from "vue";
+
+export interface FormColorProps {
+    value?: string;
+    id: string;
+}
+
+const props = withDefaults(defineProps<FormColorProps>(), {
+    value: "",
+});
+
+const emit = defineEmits<{
+    (e: "input", value: string): void;
+}>();
+
+const currentValue = computed({
+    get() {
+        return props.value;
+    },
+    set(newValue) {
+        emit("input", newValue);
+    },
+});
+</script>
+
 <template>
     <b-row>
         <b-col class="form-color-input">
@@ -9,30 +35,6 @@
     </b-row>
 </template>
 
-<script>
-export default {
-    props: {
-        value: {
-            type: String,
-            default: "",
-        },
-        id: {
-            type: String,
-            required: true,
-        },
-    },
-    computed: {
-        currentValue: {
-            get() {
-                return this.value;
-            },
-            set(val) {
-                this.$emit("input", val);
-            },
-        },
-    },
-};
-</script>
 <style scoped>
 .form-color-input {
     max-width: 3.6rem;
diff --git a/client/src/components/Form/Elements/FormDirectory.test.js b/client/src/components/Form/Elements/FormDirectory.test.js
index e69dcd45b3c..5b36947f9b7 100644
--- a/client/src/components/Form/Elements/FormDirectory.test.js
+++ b/client/src/components/Form/Elements/FormDirectory.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import FormDirectory from "./FormDirectory";
 import FilesDialog from "components/FilesDialog/FilesDialog";
 
diff --git a/client/src/components/Form/Elements/FormHidden.test.js b/client/src/components/Form/Elements/FormHidden.test.js
index c25c4e382e7..bc20368e2bf 100644
--- a/client/src/components/Form/Elements/FormHidden.test.js
+++ b/client/src/components/Form/Elements/FormHidden.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import FormHidden from "./FormHidden";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/Form/Elements/FormInput.test.js b/client/src/components/Form/Elements/FormInput.test.js
index 964e1f9d7da..cb1161d9051 100644
--- a/client/src/components/Form/Elements/FormInput.test.js
+++ b/client/src/components/Form/Elements/FormInput.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import FormInput from "./FormInput";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/Form/Elements/FormNumber.test.js b/client/src/components/Form/Elements/FormNumber.test.js
index 2805a76ecac..1864f1fac02 100644
--- a/client/src/components/Form/Elements/FormNumber.test.js
+++ b/client/src/components/Form/Elements/FormNumber.test.js
@@ -1,6 +1,6 @@
 import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import FormNumber from "./FormNumber";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/Form/Elements/FormOptionalText.test.js b/client/src/components/Form/Elements/FormOptionalText.test.js
new file mode 100644
index 00000000000..ab859e305bb
--- /dev/null
+++ b/client/src/components/Form/Elements/FormOptionalText.test.js
@@ -0,0 +1,35 @@
+import { mount } from "@vue/test-utils";
+import { getLocalVue } from "tests/jest/helpers";
+import FormOptionalText from "./FormOptionalText";
+
+const localVue = getLocalVue();
+
+describe("FormOptionalText", () => {
+    const mountFormOptionalText = async (props) =>
+        await mount(FormOptionalText, {
+            propsData: props,
+            localVue,
+        });
+
+    it("should display existing values", async () => {
+        const v = "somevalue";
+        const wrapper = await mountFormOptionalText({ value: v });
+        const el = wrapper.find("input");
+        expect(el.element.checked).toEqual(true);
+        const elText = wrapper.find("input[type='text']");
+        expect(elText.element.value).toEqual(v);
+        await el.setChecked(false);
+        expect(wrapper.emitted().input[0][0]).toEqual(null);
+        await el.setChecked(true);
+        expect(wrapper.emitted().input[1][0]).toEqual("");
+    });
+
+    it("should initialize with null if value does not exist", async () => {
+        const v = null;
+        const wrapper = await mountFormOptionalText({ value: v });
+        const el = wrapper.find("input");
+        expect(el.element.checked).toEqual(false);
+        await wrapper.setProps({ value: "" });
+        expect(el.element.checked).toEqual(true);
+    });
+});
diff --git a/client/src/components/Form/Elements/FormOptionalText.vue b/client/src/components/Form/Elements/FormOptionalText.vue
new file mode 100644
index 00000000000..d399d48af58
--- /dev/null
+++ b/client/src/components/Form/Elements/FormOptionalText.vue
@@ -0,0 +1,91 @@
+<template>
+    <div>
+        <b-form-checkbox v-model="currentStatus" class="ui-switch" switch>
+            Set value for this optional select field?
+        </b-form-checkbox>
+        <FormText
+            v-if="currentStatus"
+            :id="id"
+            v-model="currentValue"
+            :readonly="readonly"
+            :value="value"
+            :area="area"
+            :placeholder="placeholder"
+            :multiple="multiple"
+            :datalist="datalist"
+            :type="type" />
+    </div>
+</template>
+
+<script>
+import FormText from "./FormText";
+export default {
+    components: {
+        FormText,
+    },
+    props: {
+        value: {
+            default: "",
+        },
+        id: {
+            type: String,
+            default: null,
+        },
+        type: {
+            type: String,
+            default: "text",
+        },
+        area: {
+            // <textarea> instead of <input> element
+            type: Boolean,
+            default: false,
+        },
+        multiple: {
+            // Allow multiple entries to be created
+            type: Boolean,
+            default: false,
+        },
+        readonly: {
+            type: Boolean,
+            default: false,
+        },
+        placeholder: {
+            type: String,
+            default: null,
+        },
+        datalist: {
+            // Display list of suggestions in autocomplete dialog
+            type: Array,
+            default: null,
+        },
+    },
+    data() {
+        return {
+            status: false,
+        };
+    },
+    computed: {
+        currentValue: {
+            get() {
+                return this.value;
+            },
+            set(val) {
+                this.$emit("input", val);
+            },
+        },
+        currentStatus: {
+            get() {
+                return this.status || this.value !== null;
+            },
+            set(val) {
+                this.status = Boolean(val);
+                if (this.status) {
+                    this.currentValue = "";
+                } else {
+                    this.currentValue = null;
+                }
+            },
+        },
+    },
+};
+</script>
diff --git a/client/src/components/Form/Elements/FormParameter.vue b/client/src/components/Form/Elements/FormParameter.vue
index ac20e2d5aa4..151e4734765 100644
--- a/client/src/components/Form/Elements/FormParameter.vue
+++ b/client/src/components/Form/Elements/FormParameter.vue
@@ -56,5 +56,8 @@ export default {
             this.$emit("input", this.parameter.field.value());
         });
     },
+    beforeDestroy() {
+        this.parameter.remove();
+    },
 };
 </script>
diff --git a/client/src/components/Form/Elements/FormRadio.test.js b/client/src/components/Form/Elements/FormRadio.test.js
index e771cadc07a..e1761cf9c17 100644
--- a/client/src/components/Form/Elements/FormRadio.test.js
+++ b/client/src/components/Form/Elements/FormRadio.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import MountTarget from "./FormRadio";
 
 const localVue = getLocalVue(true);
diff --git a/client/src/components/Form/Elements/FormRadio.vue b/client/src/components/Form/Elements/FormRadio.vue
index 751961e9b4b..ec133dfe3f1 100644
--- a/client/src/components/Form/Elements/FormRadio.vue
+++ b/client/src/components/Form/Elements/FormRadio.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { computed } from "vue";
 
-const $emit = defineEmits(["input"]);
+const emit = defineEmits(["input"]);
 const props = defineProps({
     value: {
         default: null,
@@ -17,15 +17,20 @@ const currentValue = computed({
         return props.value;
     },
     set: (val) => {
-        $emit("input", val);
+        emit("input", val);
     },
 });
+
+const hasOptions = computed(() => {
+    return props.options.length > 0;
+});
 </script>
 
 <template>
-    <b-form-radio-group v-model="currentValue" stacked>
+    <b-form-radio-group v-if="hasOptions" v-model="currentValue" stacked>
         <b-form-radio v-for="(option, index) in options" :key="index" :value="option[1]">
             {{ option[0] }}
         </b-form-radio>
     </b-form-radio-group>
+    <b-alert v-else v-localize variant="warning" show> No options available. </b-alert>
 </template>
diff --git a/client/src/components/Form/Elements/FormRulesEdit.vue b/client/src/components/Form/Elements/FormRulesEdit.vue
new file mode 100644
index 00000000000..4a0308d6b17
--- /dev/null
+++ b/client/src/components/Form/Elements/FormRulesEdit.vue
@@ -0,0 +1,96 @@
+<script setup>
+import RuleCollectionBuilder from "components/RuleCollectionBuilder";
+import RulesDisplay from "components/RulesDisplay/RulesDisplay";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { ref, computed } from "vue";
+import { getAppRoot } from "onload/loadConfig";
+import axios from "axios";
+
+const props = defineProps({
+    value: {
+        type: Object,
+    },
+    target: {
+        type: Object,
+        default: null,
+    },
+});
+
+const modal = ref(null);
+const elements = ref(null);
+
+const initialRules = {
+    rules: [],
+    mapping: [],
+};
+
+const displayRules = computed(() => props.value ?? initialRules);
+
+async function onEdit() {
+    if (props.target) {
+        const url = `${getAppRoot()}api/dataset_collections/${props.target.id}?instance_type=history`;
+
+        try {
+            const response = await axios.get(url);
+            elements.value = response.data;
+            modal.value.show();
+        } catch (e) {
+            console.error(e);
+            console.log("problem fetching collection");
+        }
+    } else {
+        modal.value.show();
+    }
+}
+
+const emit = defineEmits(["input"]);
+
+function onSaveRules(rules) {
+    modal.value.hide();
+    emit("input", rules);
+}
+
+function onCancel() {
+    modal.value.hide();
+}
+</script>
+
+<script>
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { faEdit } from "@fortawesome/free-solid-svg-icons";
+
+library.add(faEdit);
+</script>
+
+<template>
+    <div class="form-rules-edit">
+        <RulesDisplay :input-rules="displayRules" />
+        <b-button title="Edit Rules" @click="onEdit">
+            <FontAwesomeIcon icon="fa-edit" />
+            <span>Edit</span>
+        </b-button>
+
+        <b-modal ref="modal" modal-class="ui-form-rules-edit-modal" hide-footer>
+            <template v-slot:modal-title>
+                <h2 class="mb-0">Build Rules for Applying to Existing Collection</h2>
+            </template>
+            <RuleCollectionBuilder
+                elements-type="collection_contents"
+                import-type="collections"
+                :initial-elements="elements"
+                :initial-rules="props.value"
+                :save-rules-fn="onSaveRules"
+                :oncancel="onCancel"
+                :oncreate="() => {}" />
+        </b-modal>
+    </div>
+</template>
+
+<style lang="scss">
+.ui-form-rules-edit-modal {
+    .modal-dialog {
+        width: 100%;
+        max-width: 85%;
+    }
+}
+</style>
diff --git a/client/src/components/Form/Elements/FormSelection.vue b/client/src/components/Form/Elements/FormSelection.vue
index 4ba5e7dd90f..7698ad4b119 100644
--- a/client/src/components/Form/Elements/FormSelection.vue
+++ b/client/src/components/Form/Elements/FormSelection.vue
@@ -1,5 +1,6 @@
 <script setup>
 import { computed } from "vue";
+import FormCheck from "./FormCheck";
 import FormRadio from "./FormRadio";
 
 const $emit = defineEmits(["input"]);
@@ -50,5 +51,6 @@ const currentOptions = computed(() => {
 </script>
 
 <template>
-    <form-radio v-if="display == 'radio'" v-model="currentValue" :options="currentOptions" />
+    <form-check v-if="display === 'checkboxes'" v-model="currentValue" :options="currentOptions" />
+    <form-radio v-else-if="display === 'radio'" v-model="currentValue" :options="currentOptions" />
 </template>
diff --git a/client/src/components/Form/Elements/FormText.test.js b/client/src/components/Form/Elements/FormText.test.js
new file mode 100644
index 00000000000..0a4c2953b06
--- /dev/null
+++ b/client/src/components/Form/Elements/FormText.test.js
@@ -0,0 +1,78 @@
+import { mount } from "@vue/test-utils";
+import { getLocalVue } from "tests/jest/helpers";
+import FormText from "./FormText";
+
+const localVue = getLocalVue();
+
+describe("FormText", () => {
+    const mountFormText = async (props) =>
+        await mount(FormText, {
+            propsData: props,
+            localVue,
+        });
+
+    it("should render the appropriate input type", async () => {
+        const wrapper = await mountFormText({});
+        const el = wrapper.find("input[type='text']");
+        expect(el.exists()).toBe(true);
+        await wrapper.setProps({ type: "password" });
+        const elPassword = wrapper.find("input[type='password']");
+        expect(elPassword.exists()).toBe(true);
+        await wrapper.setProps({ type: "anyothertype" });
+        const elOtherType = wrapper.find("input[type='text']");
+        expect(elOtherType.exists()).toBe(true);
+    });
+
+    it("should render the appropriate component", async () => {
+        const wrapper = await mountFormText({ area: true });
+        const el = wrapper.find("textarea");
+        expect(el.exists()).toBe(true);
+        await wrapper.setProps({ area: false, multiple: true });
+        const elMultiple = wrapper.find("textarea");
+        expect(elMultiple.exists()).toBe(true);
+    });
+
+    it("should be able to render a datalist", async () => {
+        const wrapper = await mountFormText({ id: "text-input", datalist: ["one", "two", "three"] });
+        let el = wrapper.find("datalist");
+        expect(el.exists()).toBe(true);
+        el = wrapper.find("option");
+        expect(el.exists()).toBe(true);
+        el = wrapper.find("[list='text-input-datalist']");
+        expect(el.exists()).toBe(true);
+    });
+
+    it("should be able to render border and text color from props", async () => {
+        const wrapper = await mountFormText({});
+        const el = wrapper.find("input");
+        expect(el.element.style).toMatchObject({});
+        await wrapper.setProps({ color: "green" });
+        expect(el.element.style).toMatchObject({ color: "green", "border-color": "green" });
+        await wrapper.setProps({ cls: "my-custom-class" });
+        expect(el.element.classList).toContain("my-custom-class");
+    });
+
+    it("should be able to accept a default value", async () => {
+        const v = "something";
+        const wrapper = await mountFormText({ value: v });
+        const el = wrapper.find("input");
+        expect(el.props("value")).toEqual(v);
+    });
+
+    it("should be able to accept an array as value", async () => {
+        const v = ["field_1", "field_2", "field_3"];
+        const wrapper = await mountFormText({ value: v });
+        const el = wrapper.find("input");
+        expect(el.props("value")).toEqual("field_1");
+        await wrapper.setProps({ multiple: true });
+        const elMultiple = wrapper.find("textarea");
+        expect(elMultiple.props("value")).toEqual("field_1\nfield_2\nfield_3\n");
+    });
+
+    it("should be able to accept an empty array as value", async () => {
+        const v = [];
+        const wrapper = await mountFormText({ value: v });
+        const el = wrapper.find("input");
+        expect(el.props("value")).toEqual("");
+    });
+});
diff --git a/client/src/components/Form/Elements/FormText.vue b/client/src/components/Form/Elements/FormText.vue
new file mode 100644
index 00000000000..8a07155ae4f
--- /dev/null
+++ b/client/src/components/Form/Elements/FormText.vue
@@ -0,0 +1,118 @@
+<template>
+    <b-row align-v="center">
+        <b-col>
+            <b-form-textarea
+                v-if="inputArea"
+                :id="id"
+                v-model="currentValue"
+                :class="['ui-text-area', cls]"
+                :readonly="readonly"
+                :placeholder="placeholder"
+                :style="style" />
+            <b-form-input
+                v-else
+                :id="id"
+                v-model="currentValue"
+                :class="['ui-input', cls]"
+                :readonly="readonly"
+                :placeholder="placeholder"
+                :style="style"
+                :type="acceptedTypes"
+                :list="`${id}-datalist`" />
+            <datalist v-if="datalist && !inputArea" :id="`${id}-datalist`">
+                <option v-for="data in datalist" :key="data.value" :label="data.label" :value="data.value" />
+            </datalist>
+        </b-col>
+    </b-row>
+</template>
+
+<script>
+export default {
+    props: {
+        value: {
+            // String; Array for multiple
+            default: "",
+        },
+        id: {
+            type: String,
+            default: "",
+        },
+        type: {
+            type: String,
+            default: "text",
+        },
+        area: {
+            // <textarea> instead of <input> element
+            type: Boolean,
+            default: false,
+        },
+        multiple: {
+            // Allow multiple entries to be created
+            type: Boolean,
+            default: false,
+        },
+        readonly: {
+            type: Boolean,
+            default: false,
+        },
+        placeholder: {
+            type: String,
+            default: "",
+        },
+        color: {
+            type: String,
+            default: null,
+        },
+        cls: {
+            // Refers to an optional custom css class name
+            type: String,
+            default: null,
+        },
+        datalist: {
+            // Display list of suggestions in autocomplete dialog
+            type: Array,
+            default: null,
+        },
+    },
+    computed: {
+        acceptedTypes() {
+            return ["text", "password"].includes(this.type) ? this.type : "text";
+        },
+        currentValue: {
+            get() {
+                const v = this.value ?? "";
+                if (Array.isArray(v)) {
+                    if (v.length === 0) {
+                        return "";
+                    }
+                    return this.multiple
+                        ? this.value.reduce((str_value, v) => str_value + String(v) + "\n", "")
+                        : String(this.value[0]);
+                }
+                return String(v);
+            },
+            set(newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.$emit("input", newVal);
+                }
+            },
+        },
+        inputArea() {
+            return this.area || this.multiple;
+        },
+        style() {
+            return this.color
+                ? {
+                      color: this.color,
+                      "border-color": this.color,
+                  }
+                : null;
+        },
+    },
+};
+</script>
+<style scoped>
+.ui-input-linked {
+    border-left-width: 0.5rem;
+}
+</style>
diff --git a/client/src/components/Form/Elements/parameters.js b/client/src/components/Form/Elements/parameters.js
index 40ad903c675..c9fbc13a745 100644
--- a/client/src/components/Form/Elements/parameters.js
+++ b/client/src/components/Form/Elements/parameters.js
@@ -8,7 +8,6 @@ import Ui from "mvc/ui/ui-misc";
 import SelectContent from "mvc/ui/ui-select-content";
 import SelectLibrary from "mvc/ui/ui-select-library";
 import SelectFtp from "mvc/ui/ui-select-ftp";
-import RulesEdit from "mvc/ui/ui-rules-edit";
 import DataPicker from "mvc/ui/ui-data-picker";
 
 // create form view
@@ -31,6 +30,11 @@ export default Backbone.View.extend({
         data_dialog: "_fieldDialog",
     },
 
+    remove: function () {
+        this.field.remove();
+        Backbone.View.prototype.remove.call(this);
+    },
+
     /** Returns an input field for a given field type */
     create: function (input_def) {
         const Galaxy = getGalaxyInstance();
@@ -197,14 +201,6 @@ export default Backbone.View.extend({
         });
     },
 
-    _fieldRulesEdit: function (input_def) {
-        return new RulesEdit.View({
-            id: input_def.id,
-            onchange: input_def.onchange,
-            target: input_def.target,
-        });
-    },
-
     /** Upload file field */
     _fieldUpload: function (input_def) {
         return new Ui.Upload({
diff --git a/client/src/components/Form/FormCard.test.js b/client/src/components/Form/FormCard.test.js
index 5588befaa20..227cec8a4d8 100644
--- a/client/src/components/Form/FormCard.test.js
+++ b/client/src/components/Form/FormCard.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import FormCard from "./FormCard";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/Form/FormDisplay.test.js b/client/src/components/Form/FormDisplay.test.js
index 3443c2bffcb..ca802103b45 100644
--- a/client/src/components/Form/FormDisplay.test.js
+++ b/client/src/components/Form/FormDisplay.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import FormDisplay from "./FormDisplay";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/Form/FormElement.test.js b/client/src/components/Form/FormElement.test.js
index c361c6b616a..79a7770442f 100644
--- a/client/src/components/Form/FormElement.test.js
+++ b/client/src/components/Form/FormElement.test.js
@@ -1,8 +1,8 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import FormElement from "./FormElement";
 import FormHidden from "./Elements/FormHidden";
-import FormInput from "./Elements/FormInput";
+import FormText from "./Elements/FormText";
 
 const localVue = getLocalVue();
 
@@ -70,12 +70,17 @@ describe("FormElement", () => {
 
     it("check type matching", async () => {
         await wrapper.setProps({ type: "text" });
-        expect(wrapper.findComponent(FormInput).exists()).toBe(true);
+        expect(wrapper.findComponent(FormText).exists()).toBe(true);
         expect(wrapper.findComponent(FormHidden).exists()).toBe(false);
 
         await wrapper.setProps({ attributes: { titleonly: true } });
         expect(wrapper.findComponent(FormHidden).exists()).toBe(true);
-        expect(wrapper.findComponent(FormInput).exists()).toBe(false);
+        expect(wrapper.findComponent(FormText).exists()).toBe(false);
+    });
+
+    it("displays as the correct type if is_workflow is true", async () => {
+        await wrapper.setProps({ type: "data_column", attributes: { is_workflow: true } });
+        expect(wrapper.findComponent(FormText).exists()).toBe(true);
     });
 
     it("marks required values", async () => {
diff --git a/client/src/components/Form/FormElement.vue b/client/src/components/Form/FormElement.vue
index 3779ef7bab5..9e74614f742 100644
--- a/client/src/components/Form/FormElement.vue
+++ b/client/src/components/Form/FormElement.vue
@@ -1,110 +1,85 @@
-<script setup>
-import FormBoolean from "./Elements/FormBoolean";
-import FormHidden from "./Elements/FormHidden";
-import FormInput from "./Elements/FormInput";
-import FormParameter from "./Elements/FormParameter";
-import FormSelection from "./Elements/FormSelection";
-import FormColor from "./Elements/FormColor";
-import FormDirectory from "./Elements/FormDirectory";
-import FormNumber from "./Elements/FormNumber";
+<script setup lang="ts">
+import FormBoolean from "./Elements/FormBoolean.vue";
+import FormHidden from "./Elements/FormHidden.vue";
+import FormInput from "./Elements/FormInput.vue";
+import FormParameter from "./Elements/FormParameter.vue";
+import FormSelection from "./Elements/FormSelection.vue";
+import FormColor from "./Elements/FormColor.vue";
+import FormDirectory from "./Elements/FormDirectory.vue";
+import FormNumber from "./Elements/FormNumber.vue";
+import FormText from "./Elements/FormText.vue";
+import FormOptionalText from "./Elements/FormOptionalText.vue";
+import FormRulesEdit from "./Elements/FormRulesEdit.vue";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { ref, computed, useAttrs } from "vue";
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { faExclamation, faTimes, faArrowsAltH } from "@fortawesome/free-solid-svg-icons";
+import { faCaretSquareDown, faCaretSquareUp } from "@fortawesome/free-regular-svg-icons";
 
-const props = defineProps({
-    id: {
-        type: String,
-        default: "identifier",
-    },
-    type: {
-        type: String,
-        default: null,
-    },
-    value: {
-        default: null,
-    },
-    title: {
-        type: String,
-        default: null,
-    },
-    refreshOnChange: {
-        type: Boolean,
-        default: false,
-    },
-    help: {
-        type: String,
-        default: null,
-    },
-    error: {
-        type: String,
-        default: null,
-    },
-    backbonejs: {
-        type: Boolean,
-        default: false,
-    },
-    disabled: {
-        type: Boolean,
-        default: false,
-    },
-    attributes: {
-        type: Object,
-        default: null,
-    },
-    collapsedEnableText: {
-        type: String,
-        default: "Enable",
-    },
-    collapsedDisableText: {
-        type: String,
-        default: "Disable",
-    },
-    collapsedEnableIcon: {
-        type: String,
-        default: "far fa-caret-square-down",
-    },
-    collapsedDisableIcon: {
-        type: String,
-        default: "far fa-caret-square-up",
-    },
-    connectedEnableText: {
-        type: String,
-        default: "Remove connection from module.",
-    },
-    connectedDisableText: {
-        type: String,
-        default: "Add connection to module.",
-    },
-    connectedEnableIcon: {
-        type: String,
-        default: "fa fa-times",
-    },
-    connectedDisableIcon: {
-        type: String,
-        default: "fa fa-arrows-alt-h",
-    },
-    workflowBuildingMode: {
-        type: Boolean,
-        default: false,
-    },
+import type { ComputedRef } from "vue";
+import type { FormParameterTypes, FormParameterAttributes, FormParameterValue } from "./parameterTypes";
+
+interface FormElementProps {
+    id?: string;
+    type?: FormParameterTypes;
+    value?: FormParameterValue;
+    title?: string;
+    refreshOnChange?: boolean;
+    help?: string;
+    error?: string;
+    backbonejs?: boolean;
+    disabled?: boolean;
+    attributes?: FormParameterAttributes;
+    collapsedEnableText?: string;
+    collapsedDisableText?: string;
+    collapsedEnableIcon?: string;
+    collapsedDisableIcon?: string;
+    connectedEnableText?: string;
+    connectedDisableText?: string;
+    connectedEnableIcon?: string;
+    connectedDisableIcon?: string;
+    workflowBuildingMode?: boolean;
+}
+
+const props = withDefaults(defineProps<FormElementProps>(), {
+    id: "identifier",
+    refreshOnChange: false,
+    backbonejs: false,
+    disabled: false,
+    collapsedEnableText: "Enable",
+    collapsedDisableText: "Disable",
+    collapsedEnableIcon: "far fa-caret-square-down",
+    collapsedDisableIcon: "far fa-caret-square-up",
+    connectedEnableText: "Remove connection from module.",
+    connectedDisableText: "Add connection to module.",
+    connectedEnableIcon: "fa fa-times",
+    connectedDisableIcon: "fa fa-arrows-alt-h",
+    workflowBuildingMode: false,
 });
 
-const emit = defineEmits(["input", "change"]);
+const emit = defineEmits<{
+    (e: "input", value: FormParameterValue, id: string): void;
+    (e: "change", shouldRefresh: boolean): void;
+}>();
+
+//@ts-ignore bad library types
+library.add(faExclamation, faTimes, faArrowsAltH, faCaretSquareDown, faCaretSquareUp);
 
 /** TODO: remove attrs computed.
  useAttrs is *not* reactive, and does not play nice with type safety.
  It is present for compatibility with the legacy "FormParameter" component,
  but should be removed as soon as that component is removed.
  */
-const attrs = computed(() => props.attributes || useAttrs());
-const collapsibleValue = computed(() => attrs.value["collapsible_value"]);
-const defaultValue = computed(() => attrs.value["default_value"]);
-const connectedValue = { __class__: "ConnectedValue" };
+const attrs: ComputedRef<FormParameterAttributes> = computed(() => props.attributes || useAttrs());
+const collapsibleValue: ComputedRef<FormParameterValue> = computed(() => attrs.value["collapsible_value"]);
+const defaultValue: ComputedRef<FormParameterValue> = computed(() => attrs.value["default_value"]);
+const connectedValue: FormParameterValue = { __class__: "ConnectedValue" };
 
 const connected = ref(false);
 const collapsed = ref(false);
 
 const collapsible = computed(() => !props.disabled && collapsibleValue.value !== undefined);
-const connectable = computed(() => collapsible.value && attrs.value["connectable"]);
+const connectable = computed(() => collapsible.value && Boolean(attrs.value["connectable"]));
 
 // Determines to wether expand or collapse the input
 {
@@ -117,7 +92,7 @@ const connectable = computed(() => collapsible.value && attrs.value["connectable
 }
 
 /** Submits a changed value. */
-function setValue(value) {
+function setValue(value: FormParameterValue) {
     emit("input", value, props.id);
     emit("change", props.refreshOnChange);
 }
@@ -153,7 +128,7 @@ const showField = computed(() => !collapsed.value && !props.disabled);
 const previewText = computed(() => attrs.value["text_value"]);
 const helpText = computed(() => {
     const helpArgument = attrs.value["argument"];
-    if (helpArgument && !props.help.includes(`(${helpArgument})`)) {
+    if (helpArgument && !props.help?.includes(`(${helpArgument})`)) {
         return `${props.help} (${helpArgument})`;
     } else {
         return props.help;
@@ -170,7 +145,9 @@ const currentValue = computed({
 });
 
 const isHiddenType = computed(
-    () => ["hidden", "hidden_data", "baseurl"].includes(props.type) || (props.attributes && props.attributes.titleonly)
+    () =>
+        ["hidden", "hidden_data", "baseurl"].includes(props.type ?? "") ||
+        (props.attributes && props.attributes.titleonly)
 );
 
 const collapseText = computed(() => (collapsed.value ? props.collapsedEnableText : props.collapsedDisableText));
@@ -181,7 +158,7 @@ const isEmpty = computed(() => {
         return true;
     }
 
-    if (["text", "integer", "float", "password"].includes(props.type) && currentValue.value === "") {
+    if (["text", "integer", "float", "password"].includes(props.type ?? "") && currentValue.value === "") {
         return true;
     }
 
@@ -193,14 +170,6 @@ const isRequiredType = computed(() => props.type !== "boolean");
 const isOptional = computed(() => !isRequired.value && attrs.value["optional"] !== undefined);
 </script>
 
-<script>
-import { library } from "@fortawesome/fontawesome-svg-core";
-import { faExclamation, faTimes, faArrowsAltH } from "@fortawesome/free-solid-svg-icons";
-import { faCaretSquareDown, faCaretSquareUp } from "@fortawesome/free-regular-svg-icons";
-
-library.add(faExclamation, faTimes, faArrowsAltH, faCaretSquareDown, faCaretSquareUp);
-</script>
-
 <template>
     <div
         v-show="!isHidden"
@@ -247,7 +216,6 @@ library.add(faExclamation, faTimes, faArrowsAltH, faCaretSquareDown, faCaretSqua
                 - optional
             </span>
         </div>
-
         <div v-if="showField" class="ui-form-field" :data-label="props.title">
             <FormBoolean v-if="props.type === 'boolean'" :id="props.id" v-model="currentValue" />
             <FormHidden v-else-if="isHiddenType" :id="props.id" v-model="currentValue" :info="attrs['info']" />
@@ -257,10 +225,37 @@ library.add(faExclamation, faTimes, faArrowsAltH, faCaretSquareDown, faCaretSqua
                 v-model="currentValue"
                 :max="attrs.max"
                 :min="attrs.min"
-                :type="type"
+                :type="props.type ?? 'float'"
                 :workflow-building-mode="workflowBuildingMode" />
+            <FormOptionalText
+                v-else-if="props.type === 'select' && attrs.is_workflow && attrs.optional"
+                :id="id"
+                v-model="currentValue"
+                :readonly="attrs.readonly"
+                :value="attrs.value"
+                :area="attrs.area"
+                :placeholder="attrs.placeholder"
+                :multiple="attrs.multiple"
+                :datalist="attrs.datalist"
+                :type="props.type" />
+            <FormText
+                v-else-if="
+                    ['text', 'password'].includes(props.type) ||
+                    (attrs.is_workflow && ['select', 'genomebuild', 'data_column', 'group_tag'].includes(props.type))
+                "
+                :id="id"
+                v-model="currentValue"
+                :readonly="attrs.readonly"
+                :value="attrs.value"
+                :area="attrs.area"
+                :placeholder="attrs.placeholder"
+                :color="attrs.color"
+                :multiple="attrs.multiple"
+                :cls="attrs.cls"
+                :datalist="attrs.datalist"
+                :type="props.type" />
             <FormSelection
-                v-else-if="props.type == 'select' && attrs.display == 'radio'"
+                v-else-if="props.type === 'select' && ['radio', 'checkboxes'].includes(attrs.display)"
                 :id="id"
                 v-model="currentValue"
                 :data="attrs.data"
@@ -270,12 +265,13 @@ library.add(faExclamation, faTimes, faArrowsAltH, faCaretSquareDown, faCaretSqua
                 :multiple="attrs.multiple" />
             <FormColor v-else-if="props.type === 'color'" :id="props.id" v-model="currentValue" />
             <FormDirectory v-else-if="props.type === 'directory_uri'" v-model="currentValue" />
+            <FormRulesEdit v-else-if="props.type == 'rules'" v-model="currentValue" :target="attrs.target" />
             <FormParameter
                 v-else-if="backbonejs"
                 :id="props.id"
                 v-model="currentValue"
                 :data-label="props.title"
-                :type="props.type"
+                :type="props.type ?? 'text'"
                 :attributes="attrs" />
             <FormInput v-else :id="props.id" v-model="currentValue" :area="attrs['area']" />
         </div>
diff --git a/client/src/components/Form/FormGeneric.vue b/client/src/components/Form/FormGeneric.vue
index a9aaa261fe1..be8ff3124b4 100644
--- a/client/src/components/Form/FormGeneric.vue
+++ b/client/src/components/Form/FormGeneric.vue
@@ -25,7 +25,7 @@
 </template>
 
 <script>
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 import { submitData } from "./services";
 import { UrlDataProvider } from "components/providers/UrlDataProvider";
 import { visitInputs } from "components/Form/utilities";
@@ -99,7 +99,7 @@ export default {
             this.formData = formData;
         },
         onCancel() {
-            window.location = safePath(this.cancelRedirect);
+            window.location = withPrefix(this.cancelRedirect);
         },
         onSubmit() {
             submitData(this.url, this.formData).then((response) => {
@@ -115,7 +115,7 @@ export default {
                 }
                 if (this.redirect) {
                     const urlParams = new URLSearchParams(params);
-                    window.location = safePath(`${this.redirect}?${urlParams.toString()}`);
+                    window.location = withPrefix(`${this.redirect}?${urlParams.toString()}`);
                 } else {
                     const replaceParams = {};
                     visitInputs(response.inputs, (input, name) => {
diff --git a/client/src/components/Form/FormMessage.test.js b/client/src/components/Form/FormMessage.test.js
index 20fb45ea581..1e869ab2238 100644
--- a/client/src/components/Form/FormMessage.test.js
+++ b/client/src/components/Form/FormMessage.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import FormMessage from "./FormMessage";
 
 jest.mock("app");
diff --git a/client/src/components/Form/parameterTypes.d.ts b/client/src/components/Form/parameterTypes.d.ts
new file mode 100644
index 00000000000..e3c7ca53574
--- /dev/null
+++ b/client/src/components/Form/parameterTypes.d.ts
@@ -0,0 +1,30 @@
+// TODO: stricter types
+export type FormParameterValue = any;
+export type FormParameterAttributes = {
+    [attribute: string]: any;
+};
+
+export type FormParameterTypes =
+    | "boolean"
+    | "hidden"
+    | "hidden_data"
+    | "baseurl"
+    | "integer"
+    | "float"
+    | "radio"
+    | "color"
+    | "directory_uri"
+    | "text"
+    | "password"
+    | "select"
+    | "data_column"
+    | "genomebuild"
+    | "data"
+    | "data_collection"
+    | "drill_down"
+    | "group_tag"
+    | "library_data"
+    | "ftpfile"
+    | "upload"
+    | "rules"
+    | "data_dialog";
diff --git a/client/src/components/Form/services.js b/client/src/components/Form/services.js
index f3fc2165410..b5aff25a2de 100644
--- a/client/src/components/Form/services.js
+++ b/client/src/components/Form/services.js
@@ -1,10 +1,10 @@
 import axios from "axios";
 import { rethrowSimple } from "utils/simple-error";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 
 export async function submitData(url, payload) {
     try {
-        const { data } = await axios.put(safePath(url), payload);
+        const { data } = await axios.put(withPrefix(url), payload);
         return data;
     } catch (e) {
         rethrowSimple(e);
diff --git a/client/src/components/History/Content/Collection/CollectionDescription.test.js b/client/src/components/History/Content/Collection/CollectionDescription.test.js
index 85cb23e3fce..6bd7df02970 100644
--- a/client/src/components/History/Content/Collection/CollectionDescription.test.js
+++ b/client/src/components/History/Content/Collection/CollectionDescription.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import CollectionDescription from "./CollectionDescription";
 import { JobStateSummary } from "./JobStateSummary";
 
diff --git a/client/src/components/History/Content/Collection/CollectionProgress.test.js b/client/src/components/History/Content/Collection/CollectionProgress.test.js
index ba145a4b962..261779a9568 100644
--- a/client/src/components/History/Content/Collection/CollectionProgress.test.js
+++ b/client/src/components/History/Content/Collection/CollectionProgress.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import CollectionProgress from "./CollectionProgress";
 import { JobStateSummary } from "./JobStateSummary";
 
diff --git a/client/src/components/History/Content/ContentItem.test.js b/client/src/components/History/Content/ContentItem.test.js
index ef56ea40e7e..ce8e4673233 100644
--- a/client/src/components/History/Content/ContentItem.test.js
+++ b/client/src/components/History/Content/ContentItem.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import ContentItem from "./ContentItem";
 import { updateContentFields } from "components/History/model/queries";
 
@@ -30,50 +30,70 @@ describe("ContentItem", () => {
                 name: "name",
                 selected: false,
                 selectable: false,
+                filterable: true,
             },
             localVue,
             stubs: {
                 DatasetDetails: true,
                 vueTagsInput: false,
             },
+            provide: {
+                store: {
+                    dispatch: jest.fn,
+                    getters: {},
+                },
+            },
         });
     });
 
     it("check basics", async () => {
         expect(wrapper.attributes("data-hid")).toBe("1");
         expect(wrapper.find(".content-title").text()).toBe("name");
-        const tags = wrapper.find(".alltags").findAll(".ti-tag");
+        const tags = wrapper.find(".stateless-tags").findAll(".tag");
+
         // verify tags
         expect(tags.length).toBe(3);
+
         for (let i = 0; i < 3; i++) {
             expect(tags.at(i).text()).toBe(`tag${i + 1}`);
-            await tags.at(i).find(".tag-name").trigger("click");
+
+            await tags.at(i).trigger("click");
             expect(wrapper.emitted()["tag-click"][i][0]).toBe(`tag${i + 1}`);
         }
+
         // close all tags
         for (let i = 0; i < 3; i++) {
-            const tagRemover = wrapper.find(".ti-icon-close");
+            const tagRemover = wrapper.find(`.tag[data-option=tag${i + 1}] button`);
+
             await tagRemover.trigger("click");
             expect(wrapper.emitted()["tag-change"][i][1]).not.toContain(`tag${i + 1}`);
         }
+
         await wrapper.setProps({ isHistoryItem: false, item: { tags: [] } });
-        expect(wrapper.find(".alltags").exists()).toBe(false);
+        expect(wrapper.find(".stateless-tags").exists()).toBe(false);
+
         // expansion button
         const $el = wrapper.find(".cursor-pointer");
         $el.trigger("click");
         expect(wrapper.emitted()["update:expand-dataset"]).toBeDefined();
+
         // select and unselect
         const noSelector = wrapper.find(".selector > svg");
         expect(noSelector.exists()).toBe(false);
+
         await wrapper.setProps({ selectable: true });
         expect(wrapper.classes()).toEqual(expect.arrayContaining(["alert-success"]));
+
         const selector = wrapper.find(".selector > svg");
         expect(selector.attributes("data-icon")).toBe("square");
         selector.trigger("click");
+
         await localVue.nextTick();
         expect(wrapper.emitted()["update:selected"][0][0]).toBe(true);
+
         await wrapper.setProps({ selected: true });
         selector.trigger("click");
+
         await localVue.nextTick();
         expect(wrapper.emitted()["update:selected"][1][0]).toBe(false);
         expect(wrapper.classes()).toEqual(expect.arrayContaining(["alert-info"]));
diff --git a/client/src/components/History/Content/ContentItem.vue b/client/src/components/History/Content/ContentItem.vue
index 0ff44351494..34171c74de5 100644
--- a/client/src/components/History/Content/ContentItem.vue
+++ b/client/src/components/History/Content/ContentItem.vue
@@ -3,57 +3,45 @@
         :id="contentId"
         :class="['content-item m-1 p-0 rounded btn-transparent-background', contentCls]"
         :data-hid="id"
-        :data-state="state">
-        <div
-            class="p-1 cursor-pointer"
-            draggable
-            tabindex="0"
-            @dragstart="onDragStart"
-            @click.stop="onClick"
-            @keypress="onClick">
+        :data-state="state"
+        tabindex="0"
+        role="button"
+        @keydown="onKeyDown">
+        <div class="p-1 cursor-pointer" draggable @dragstart="onDragStart" @click.stop="onClick">
             <div class="d-flex justify-content-between">
                 <span class="p-1 font-weight-bold">
-                    <span v-if="selectable" class="selector">
-                        <icon
-                            v-if="selected"
-                            fixed-width
-                            size="lg"
-                            :icon="['far', 'check-square']"
-                            @click.stop="$emit('update:selected', false)" />
-                        <icon
-                            v-else
-                            fixed-width
-                            size="lg"
-                            :icon="['far', 'square']"
-                            @click.stop="$emit('update:selected', true)" />
-                    </span>
-                    <span
+                    <b-button v-if="selectable" class="selector p-0" @click.stop="$emit('update:selected', !selected)">
+                        <icon v-if="selected" fixed-width size="lg" :icon="['far', 'check-square']" />
+                        <icon v-else fixed-width size="lg" :icon="['far', 'square']" />
+                    </b-button>
+                    <b-button
                         v-if="highlight == 'input'"
                         v-b-tooltip.hover
+                        variant="link"
+                        class="p-0"
                         title="Input"
-                        tabindex="0"
-                        @click.stop="toggleHighlights"
-                        @keypress="toggleHighlights">
+                        @click.stop="toggleHighlights">
                         <font-awesome-icon class="text-info" icon="arrow-circle-up" />
-                    </span>
-                    <span
-                        v-else-if="highlight == 'noInputs'"
+                    </b-button>
+                    <b-button
+                        v-else-if="highlight == 'active'"
                         v-b-tooltip.hover
-                        title="No Inputs for this item"
-                        tabindex="0"
-                        @click.stop="toggleHighlights"
-                        @keypress="toggleHighlights">
-                        <font-awesome-icon icon="minus-circle" />
-                    </span>
-                    <span
-                        v-else-if="highlight == 'output'"
-                        v-b-tooltip.hover
-                        title="Inputs highlighted for this item"
-                        tabindex="0"
+                        variant="link"
+                        class="p-0"
+                        title="Inputs/Outputs highlighted for this item"
                         @click.stop="toggleHighlights"
                         @keypress="toggleHighlights">
                         <font-awesome-icon icon="check-circle" />
-                    </span>
+                    </b-button>
+                    <b-button
+                        v-else-if="highlight == 'output'"
+                        v-b-tooltip.hover
+                        variant="link"
+                        class="p-0"
+                        title="Output"
+                        @click.stop="toggleHighlights">
+                        <font-awesome-icon class="text-info" icon="arrow-circle-down" />
+                    </b-button>
                     <span v-if="hasStateIcon" class="state-icon">
                         <icon fixed-width :icon="contentState.icon" :spin="contentState.spin" />
                     </span>
@@ -75,6 +63,7 @@
                     :is-visible="item.visible"
                     :state="state"
                     :item-urls="itemUrls"
+                    :keyboard-selectable="expandDataset"
                     @delete="$emit('delete')"
                     @display="onDisplay"
                     @showCollectionInfo="onShowCollectionInfo"
@@ -92,19 +81,19 @@
             :elements-datatypes="item.elements_datatypes" />
         <StatelessTags
             v-if="!tagsDisabled || hasTags"
-            class="alltags p-1"
             :value="tags"
-            :use-toggle-link="false"
             :disabled="tagsDisabled"
-            @tag-click="onTagClick"
-            @input="onTags" />
+            :clickable="filterable"
+            :use-toggle-link="false"
+            @input="onTags"
+            @tag-click="onTagClick" />
         <!-- collections are not expandable, so we only need the DatasetDetails component here -->
         <b-collapse :visible="expandDataset">
             <DatasetDetails
                 v-if="expandDataset"
                 :dataset="item"
                 :writable="writable"
-                :show-highlight="isHistoryItem"
+                :show-highlight="isHistoryItem && filterable"
                 :item-urls="itemUrls"
                 @edit="onEdit"
                 @toggleHighlights="toggleHighlights" />
@@ -113,7 +102,7 @@
 </template>
 
 <script>
-import { StatelessTags } from "components/Tags";
+import StatelessTags from "components/TagsMultiselect/StatelessTags";
 import { STATES, HIERARCHICAL_COLLECTION_JOB_STATES } from "./model/states";
 import CollectionDescription from "./Collection/CollectionDescription";
 import ContentOptions from "./ContentOptions";
@@ -122,10 +111,10 @@ import { updateContentFields } from "components/History/model/queries";
 import { JobStateSummary } from "./Collection/JobStateSummary";
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import { faArrowCircleUp, faMinusCircle, faCheckCircle } from "@fortawesome/free-solid-svg-icons";
-
-library.add(faArrowCircleUp, faMinusCircle, faCheckCircle);
+import { faArrowCircleUp, faArrowCircleDown, faCheckCircle } from "@fortawesome/free-solid-svg-icons";
+import { useEntryPointStore } from "stores/entryPointStore";
 
+library.add(faArrowCircleUp, faArrowCircleDown, faCheckCircle);
 export default {
     components: {
         CollectionDescription,
@@ -145,6 +134,7 @@ export default {
         name: { type: String, required: true },
         selected: { type: Boolean, default: false },
         selectable: { type: Boolean, default: false },
+        filterable: { type: Boolean, default: false },
     },
     computed: {
         jobState() {
@@ -216,6 +206,15 @@ export default {
         },
     },
     methods: {
+        onKeyDown(event) {
+            if (!event.target.classList.contains("content-item")) {
+                return;
+            }
+
+            if (event.key === "Enter" || event.key === " ") {
+                this.onClick();
+            }
+        },
         onClick() {
             if (this.isDataset) {
                 this.$emit("update:expand-dataset", !this.expandDataset);
@@ -224,7 +223,15 @@ export default {
             }
         },
         onDisplay() {
-            this.$router.push(this.itemUrls.display, { title: this.name });
+            const entryPointStore = useEntryPointStore();
+            const entryPointsForHda = entryPointStore.entryPointsForHda(this.item.id);
+            if (entryPointsForHda && entryPointsForHda.length > 0) {
+                // there can be more than one entry point, choose the first
+                const url = entryPointsForHda[0].target;
+                window.open(url, "_blank");
+            } else {
+                this.$router.push(this.itemUrls.display, { title: this.name });
+            }
         },
         onDragStart(evt) {
             evt.dataTransfer.dropEffect = "move";
@@ -242,7 +249,9 @@ export default {
             updateContentFields(this.item, { tags: newTags });
         },
         onTagClick(tag) {
-            this.$emit("tag-click", tag.label);
+            if (this.filterable) {
+                this.$emit("tag-click", tag);
+            }
         },
         toggleHighlights() {
             this.$emit("toggleHighlights", this.item);
@@ -250,10 +259,21 @@ export default {
     },
 };
 </script>
-<style lang="scss">
+
+<style lang="scss" scoped>
+@import "~bootstrap/scss/_functions.scss";
+@import "theme/blue.scss";
+
 .content-item {
+    cursor: default;
+
     .name {
         word-break: break-all;
     }
+
+    // improve focus visibility
+    &:deep(.btn:focus) {
+        box-shadow: 0 0 0 0.2rem transparentize($brand-primary, 0.75);
+    }
 }
 </style>
diff --git a/client/src/components/History/Content/ContentOptions.vue b/client/src/components/History/Content/ContentOptions.vue
index c2a9d8e4c49..330d7dd533b 100644
--- a/client/src/components/History/Content/ContentOptions.vue
+++ b/client/src/components/History/Content/ContentOptions.vue
@@ -17,6 +17,7 @@
             v-if="isDataset"
             :disabled="displayDisabled"
             :title="displayButtonTitle"
+            :tabindex="tabindex"
             class="display-btn px-1"
             size="sm"
             variant="link"
@@ -28,6 +29,7 @@
             v-if="writable && isHistoryItem"
             :disabled="editDisabled"
             :title="editButtonTitle"
+            :tabindex="tabindex"
             class="edit-btn px-1"
             size="sm"
             variant="link"
@@ -37,6 +39,7 @@
         </b-button>
         <b-button
             v-if="writable && isHistoryItem && !isDeleted"
+            :tabindex="tabindex"
             class="delete-btn px-1"
             title="Delete"
             size="sm"
@@ -46,6 +49,7 @@
         </b-button>
         <b-button
             v-if="writable && isHistoryItem && isDeleted"
+            :tabindex="tabindex"
             class="undelete-btn px-1"
             title="Undelete"
             size="sm"
@@ -55,6 +59,7 @@
         </b-button>
         <b-button
             v-if="writable && isHistoryItem && !isVisible"
+            :tabindex="tabindex"
             class="unhide-btn px-1"
             title="Unhide"
             size="sm"
@@ -66,7 +71,7 @@
 </template>
 
 <script>
-import { prependPath } from "utils/redirect.js";
+import { prependPath } from "@/utils/redirect";
 export default {
     props: {
         writable: { type: Boolean, default: true },
@@ -76,6 +81,7 @@ export default {
         isVisible: { type: Boolean, default: true },
         state: { type: String, default: "" },
         itemUrls: { type: Object, required: true },
+        keyboardSelectable: { type: Boolean, default: true },
     },
     computed: {
         displayButtonTitle() {
@@ -111,6 +117,9 @@ export default {
         showCollectionDetailsUrl() {
             return prependPath(this.itemUrls.showDetails);
         },
+        tabindex() {
+            return this.keyboardSelectable ? "0" : "-1";
+        },
     },
 };
 </script>
diff --git a/client/src/components/History/Content/Dataset/DatasetActions.vue b/client/src/components/History/Content/Dataset/DatasetActions.vue
index f0a3697ae24..46fce47e359 100644
--- a/client/src/components/History/Content/Dataset/DatasetActions.vue
+++ b/client/src/components/History/Content/Dataset/DatasetActions.vue
@@ -71,7 +71,7 @@
 
 <script>
 import { copy as sendToClipboard } from "utils/clipboard";
-import { absPath, prependPath } from "utils/redirect.js";
+import { absPath, prependPath } from "@/utils/redirect";
 import { downloadUrlMixin } from "./mixins.js";
 import DatasetDownload from "./DatasetDownload";
 
diff --git a/client/src/components/History/Content/Dataset/DatasetDownload.test.js b/client/src/components/History/Content/Dataset/DatasetDownload.test.js
index 7f8f94a0007..00273ec8050 100644
--- a/client/src/components/History/Content/Dataset/DatasetDownload.test.js
+++ b/client/src/components/History/Content/Dataset/DatasetDownload.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import DatasetDownload from "./DatasetDownload";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/History/Content/SelectedItems.js b/client/src/components/History/Content/SelectedItems.js
index 628b0aacef0..531a630d3ba 100644
--- a/client/src/components/History/Content/SelectedItems.js
+++ b/client/src/components/History/Content/SelectedItems.js
@@ -3,7 +3,7 @@
  * It allows to select individual items or perform a query selection.
  */
 
-import { getFilters, testFilters } from "utils/filterConversion";
+import { HistoryFilters } from "../HistoryFilters";
 
 export default {
     props: {
@@ -27,7 +27,7 @@ export default {
             return this.allSelected && this.totalItemsInQuery !== this.items.size;
         },
         currentFilters() {
-            return getFilters(this.filterText);
+            return HistoryFilters.getFilters(this.filterText);
         },
     },
     methods: {
@@ -40,7 +40,7 @@ export default {
         },
         isSelected(item) {
             if (this.isQuerySelection) {
-                return testFilters(this.currentFilters, item);
+                return HistoryFilters.testFilters(this.currentFilters, item);
             }
             const key = this.getItemKey(item);
             return this.items.has(key);
diff --git a/client/src/components/History/Content/SelectedItems.test.js b/client/src/components/History/Content/SelectedItems.test.js
index 4a8e34bae0d..a6d61cbcda5 100644
--- a/client/src/components/History/Content/SelectedItems.test.js
+++ b/client/src/components/History/Content/SelectedItems.test.js
@@ -1,6 +1,6 @@
 import { shallowMount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import SelectedItems from "./SelectedItems";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/History/Content/model/highlights.js b/client/src/components/History/Content/model/highlights.js
deleted file mode 100644
index 7ae21b5905a..00000000000
--- a/client/src/components/History/Content/model/highlights.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Specifies highlighted items in the history listing. The `highlight` property is passed to
- * the content item component and can be used to modify its appearance.
- * TO DO: Consider case where parameter history is different and hence inputs cannot be seen
- *        in the current panel.
- */
-import axios from "axios";
-import { prependPath } from "utils/redirect";
-import { deepeach } from "utils/utils";
-import { LastQueue } from "utils/promise-queue";
-
-// add promise queue
-const lastQueue = new LastQueue(300);
-
-/** Local cache for parameter requests */
-const paramStash = new Map();
-
-/** Performs request to obtain dataset parameters */
-async function getDatasetParameters(datasetId, jobId) {
-    if (!paramStash.has(datasetId)) {
-        const url = jobId
-            ? `api/jobs/${jobId}/parameters_display`
-            : `api/datasets/${datasetId}/parameters_display?hda_ldda=hda`;
-        const { data } = await lastQueue.enqueue(axios.get, prependPath(url));
-        paramStash.set(datasetId, data);
-    }
-    return paramStash.get(datasetId);
-}
-
-/** Returns item key */
-function getKey(details) {
-    if (details.id && details.src) {
-        const historyContentType = details.src == "hda" ? "dataset" : "dataset_collection";
-        return `${details.id}-${historyContentType}`;
-    }
-    return null;
-}
-
-/** Returns highlighting details */
-export async function getHighlights(item, itemKey) {
-    const highlights = {};
-    const { outputs, parameters } = await getDatasetParameters(item.id, item.job_source_id);
-    deepeach(parameters, (details) => {
-        const key = getKey(details);
-        if (key) {
-            highlights[key] = "input";
-        }
-    });
-    deepeach(outputs, (details) => {
-        const key = getKey(details);
-        if (key) {
-            // some other item created this item (e.g.: inheritance)
-            if (key != itemKey) {
-                highlights[itemKey] = "output";
-                highlights[key] = "input";
-            } else {
-                highlights[key] = "output";
-            }
-        }
-    });
-    // highlights only has item itself as an output (i.e.: no inputs)
-    if (highlights[itemKey] === "output" && Object.keys(highlights).length == 1) {
-        highlights[itemKey] = "noInputs";
-    }
-    // TO DO: Consider case where a job created multiple items (all highlights are outputs)
-    return highlights;
-}
diff --git a/client/src/components/History/CurrentCollection/CollectionPanel.vue b/client/src/components/History/CurrentCollection/CollectionPanel.vue
index 68af5a016f4..eb69d0ee598 100644
--- a/client/src/components/History/CurrentCollection/CollectionPanel.vue
+++ b/client/src/components/History/CurrentCollection/CollectionPanel.vue
@@ -28,6 +28,7 @@
                                     :name="item.element_identifier"
                                     :expand-dataset="isExpanded(item)"
                                     :is-dataset="item.element_type == 'hda'"
+                                    :filterable="filterable"
                                     @update:expand-dataset="setExpanded(item, $event)"
                                     @view-collection="onViewSubCollection" />
                             </template>
@@ -63,6 +64,7 @@ export default {
         history: { type: Object, required: true },
         selectedCollections: { type: Array, required: true },
         showControls: { type: Boolean, default: true },
+        filterable: { type: Boolean, default: false },
     },
     data() {
         return {
diff --git a/client/src/components/History/CurrentHistory/HistoryEmpty.vue b/client/src/components/History/CurrentHistory/HistoryEmpty.vue
index bfd16dc946a..dbd74b8ef7a 100644
--- a/client/src/components/History/CurrentHistory/HistoryEmpty.vue
+++ b/client/src/components/History/CurrentHistory/HistoryEmpty.vue
@@ -13,14 +13,17 @@
 </template>
 
 <script>
-import { openGlobalUploadModal } from "components/Upload";
+import { useGlobalUploadModal } from "composables/globalUploadModal";
 
 export default {
     props: {
         message: { type: String, default: "This history is empty." },
     },
+    setup() {
+        const { openGlobalUploadModal } = useGlobalUploadModal();
+        return { openGlobalUploadModal };
+    },
     methods: {
-        openGlobalUploadModal,
         clickDataLink() {
             this.eventHub.$emit("openToolSection", "getext");
         },
diff --git a/client/src/components/History/CurrentHistory/HistoryFilters/HistoryFilters.test.js b/client/src/components/History/CurrentHistory/HistoryFilters/HistoryFilters.test.js
index 49953de6591..0fb9f79c592 100644
--- a/client/src/components/History/CurrentHistory/HistoryFilters/HistoryFilters.test.js
+++ b/client/src/components/History/CurrentHistory/HistoryFilters/HistoryFilters.test.js
@@ -1,7 +1,7 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
 import HistoryFilters from "./HistoryFilters";
-import { getQueryDict } from "utils/filterConversion";
+import { getLocalVue } from "tests/jest/helpers";
+import { HistoryFilters as HistoryFiltering } from "components/History/HistoryFilters";
 
 const localVue = getLocalVue();
 
@@ -13,8 +13,8 @@ describe("HistoryFilters", () => {
         expect(wrapper.emitted()["update:show-advanced"][toggleEmit][0]).toEqual(showAdvanced);
         await wrapper.setProps({ showAdvanced: wrapper.emitted()["update:show-advanced"][toggleEmit][0] });
         const receivedText = wrapper.emitted()["update:filter-text"][filterEmit][0];
-        const receivedDict = getQueryDict(receivedText);
-        const parsedDict = getQueryDict(filterText);
+        const receivedDict = HistoryFiltering.getQueryDict(receivedText);
+        const parsedDict = HistoryFiltering.getQueryDict(filterText);
         expect(receivedDict).toEqual(parsedDict);
     }
 
@@ -32,6 +32,7 @@ describe("HistoryFilters", () => {
         expect(wrapper.find("[description='advanced filters']").exists()).toBe(false);
         await wrapper.setProps({ showAdvanced: true });
         expect(wrapper.find("[description='advanced filters']").exists()).toBe(true);
+        expect(wrapper.find("[description='advanced filters']").exists()).toBe(true);
         const filterInputs = {
             "[placeholder='any name']": "name-filter",
             "[placeholder='any extension']": "ext-filter",
diff --git a/client/src/components/History/CurrentHistory/HistoryFilters/HistoryFilters.vue b/client/src/components/History/CurrentHistory/HistoryFilters/HistoryFilters.vue
index 1ca647f5aac..12a81ffe24b 100644
--- a/client/src/components/History/CurrentHistory/HistoryFilters/HistoryFilters.vue
+++ b/client/src/components/History/CurrentHistory/HistoryFilters/HistoryFilters.vue
@@ -46,6 +46,8 @@
             <small class="mt-1">Filter by state:</small>
             <b-form-input v-model="filterSettings['state:']" size="sm" placeholder="any state" list="stateSelect" />
             <b-form-datalist id="stateSelect" :options="states"></b-form-datalist>
+            <small class="mt-1">Filter by related to item index:</small>
+            <b-form-input v-model="filterSettings['related:']" size="sm" placeholder="index equals" />
             <small class="mt-1">Filter by item index:</small>
             <b-form-group class="m-0">
                 <b-input-group>
@@ -85,7 +87,7 @@
 import DebouncedInput from "components/DebouncedInput";
 import HistoryFiltersDefault from "./HistoryFiltersDefault";
 import { STATES } from "components/History/Content/model/states";
-import { getFilters, getFilterText, toAlias } from "utils/filterConversion";
+import { HistoryFilters } from "components/History/HistoryFilters";
 
 export default {
     components: {
@@ -104,7 +106,7 @@ export default {
     },
     computed: {
         filterSettings() {
-            return toAlias(getFilters(this.filterText));
+            return HistoryFilters.toAlias(HistoryFilters.getFilters(this.filterText));
         },
         localFilter: {
             get() {
@@ -134,7 +136,7 @@ export default {
             this.onToggle();
             this.filterSettings["create_time>"] = this.create_time_gt;
             this.filterSettings["create_time<"] = this.create_time_lt;
-            this.updateFilter(getFilterText(this.filterSettings));
+            this.updateFilter(HistoryFilters.getFilterText(this.filterSettings));
         },
         onToggle() {
             this.$emit("update:show-advanced", !this.showAdvanced);
diff --git a/client/src/components/History/CurrentHistory/HistoryNavigation.test.js b/client/src/components/History/CurrentHistory/HistoryNavigation.test.js
index 87af50da94a..e0486579328 100644
--- a/client/src/components/History/CurrentHistory/HistoryNavigation.test.js
+++ b/client/src/components/History/CurrentHistory/HistoryNavigation.test.js
@@ -1,4 +1,4 @@
-import { mockModule, getLocalVue } from "jest/helpers";
+import { mockModule, getLocalVue } from "tests/jest/helpers";
 import { userStore } from "store/userStore";
 import Vuex from "vuex";
 import HistoryNavigation from "./HistoryNavigation";
diff --git a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.test.js b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.test.js
index f9b16323761..95b87cb95cc 100644
--- a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.test.js
+++ b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.test.js
@@ -2,7 +2,7 @@ import { shallowMount } from "@vue/test-utils";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import flushPromises from "flush-promises";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import SelectionOperations from "./SelectionOperations.vue";
 import MockConfigProvider from "components/providers/MockConfigProvider";
 
diff --git a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue
index 39834b118e5..d389d4b92e9 100644
--- a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue
+++ b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionOperations.vue
@@ -151,13 +151,13 @@ import {
     addTagsToSelectedContent,
     removeTagsFromSelectedContent,
 } from "components/History/model/crud";
-import { checkFilter, getQueryDict } from "utils/filterConversion";
 import { createDatasetCollection } from "components/History/model/queries";
 import { buildCollectionModal } from "components/History/adapters/buildCollectionModal";
 import { DbKeyProvider, DatatypesProvider } from "components/providers";
 import SingleItemSelector from "components/SingleItemSelector";
 import { StatelessTags } from "components/Tags";
 import ConfigProvider from "components/providers/ConfigProvider";
+import { HistoryFilters } from "components/History/HistoryFilters";
 
 export default {
     components: {
@@ -185,11 +185,11 @@ export default {
     computed: {
         /** @returns {Boolean} */
         showHidden() {
-            return checkFilter(this.filterText, "visible", false);
+            return HistoryFilters.checkFilter(this.filterText, "visible", false);
         },
         /** @returns {Boolean} */
         showDeleted() {
-            return checkFilter(this.filterText, "deleted", true);
+            return HistoryFilters.checkFilter(this.filterText, "deleted", true);
         },
         /** @returns {Boolean} */
         showBuildOptions() {
@@ -265,7 +265,7 @@ export default {
         async runOnSelection(operation, extraParams = null) {
             this.$emit("update:operation-running", this.history.update_time);
             const items = this.getExplicitlySelectedItems();
-            const filters = getQueryDict(this.filterText);
+            const filters = HistoryFilters.getQueryDict(this.filterText);
             this.$emit("update:show-selection", false);
             let expectHistoryUpdate = false;
             try {
diff --git a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionStatus.test.js b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionStatus.test.js
index 7b68a167aaf..c3194f55eaf 100644
--- a/client/src/components/History/CurrentHistory/HistoryOperations/SelectionStatus.test.js
+++ b/client/src/components/History/CurrentHistory/HistoryOperations/SelectionStatus.test.js
@@ -1,6 +1,6 @@
 import { shallowMount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import HistorySelectionStatus from "./SelectionStatus.vue";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/History/CurrentHistory/HistoryPanel.vue b/client/src/components/History/CurrentHistory/HistoryPanel.vue
index 45b4cafeb58..cb453905505 100644
--- a/client/src/components/History/CurrentHistory/HistoryPanel.vue
+++ b/client/src/components/History/CurrentHistory/HistoryPanel.vue
@@ -1,156 +1,149 @@
 <template>
-    <HistoryItemsProvider
-        :key="historyId"
-        v-slot="{ loading, result: itemsLoaded, count: totalItemsInQuery }"
-        :history-id="historyId"
-        :offset="offset"
-        :update-time="history.update_time"
-        :filter-text="filterText">
-        <ExpandedItems
-            v-slot="{ expandedCount, isExpanded, setExpanded, collapseAll }"
-            :scope-key="historyId"
-            :get-item-key="(item) => item.type_id">
-            <SelectedItems
-                v-slot="{
-                    selectedItems,
-                    showSelection,
-                    isQuerySelection,
-                    selectionSize,
-                    setShowSelection,
-                    selectAllInCurrentQuery,
-                    isSelected,
-                    setSelected,
-                    resetSelection,
-                }"
-                :scope-key="queryKey"
-                :get-item-key="(item) => item.type_id"
-                :filter-text="filterText"
-                :total-items-in-query="totalItemsInQuery"
-                @query-selection-break="querySelectionBreak = true">
-                <section
-                    class="history-layout d-flex flex-column w-100"
-                    @drop.prevent="onDrop"
-                    @dragenter.prevent="onDragEnter"
-                    @dragover.prevent
-                    @dragleave.prevent="onDragLeave">
-                    <slot name="navigation" :history="history" />
-                    <HistoryFilters
+    <ExpandedItems
+        v-slot="{ expandedCount, isExpanded, setExpanded, collapseAll }"
+        :scope-key="historyId"
+        :get-item-key="(item) => item.type_id">
+        <SelectedItems
+            v-slot="{
+                selectedItems,
+                showSelection,
+                isQuerySelection,
+                selectionSize,
+                setShowSelection,
+                selectAllInCurrentQuery,
+                isSelected,
+                setSelected,
+                resetSelection,
+            }"
+            :scope-key="queryKey"
+            :get-item-key="(item) => item.type_id"
+            :filter-text="filterText"
+            :total-items-in-query="totalItemsInQuery"
+            @query-selection-break="querySelectionBreak = true">
+            <section
+                class="history-layout d-flex flex-column w-100"
+                @drop.prevent="onDrop"
+                @dragenter.prevent="onDragEnter"
+                @dragover.prevent
+                @dragleave.prevent="onDragLeave">
+                <slot name="navigation" :history="history" />
+                <HistoryFilters
+                    v-if="showControls"
+                    class="content-operations-filters mx-3"
+                    :filter-text.sync="filterText"
+                    :show-advanced.sync="showAdvanced" />
+                <section v-if="!showAdvanced">
+                    <HistoryDetails
+                        :history="history"
+                        :writeable="writable"
+                        @update:history="$emit('updateHistory', $event)" />
+                    <HistoryMessages :history="history" />
+                    <HistoryCounter
                         v-if="showControls"
-                        class="content-operations-filters mx-3"
+                        :history="history"
+                        :is-watching="isWatching"
+                        :last-checked="lastChecked"
                         :filter-text.sync="filterText"
-                        :show-advanced.sync="showAdvanced" />
-                    <section v-if="!showAdvanced">
-                        <HistoryDetails
-                            :history="history"
-                            :writeable="writable"
-                            @update:history="$emit('updateHistory', $event)" />
-                        <HistoryMessages :history="history" />
-                        <HistoryCounter
-                            v-if="showControls"
-                            :history="history"
-                            :is-watching="isWatching"
-                            :last-checked="lastChecked"
-                            :filter-text.sync="filterText"
-                            @reloadContents="reloadContents" />
-                        <HistoryOperations
-                            v-if="showControls"
-                            :history="history"
-                            :show-selection="showSelection"
-                            :expanded-count="expandedCount"
-                            :has-matches="hasMatches(itemsLoaded)"
-                            :operation-running.sync="operationRunning"
-                            @update:show-selection="setShowSelection"
-                            @collapse-all="collapseAll">
-                            <template v-slot:selection-operations>
-                                <HistorySelectionOperations
-                                    :history="history"
-                                    :filter-text="filterText"
-                                    :content-selection="selectedItems"
-                                    :selection-size="selectionSize"
-                                    :is-query-selection="isQuerySelection"
-                                    :total-items-in-query="totalItemsInQuery"
-                                    :operation-running.sync="operationRunning"
-                                    @update:show-selection="setShowSelection"
-                                    @operation-error="onOperationError"
-                                    @hide-selection="onHideSelection"
-                                    @reset-selection="resetSelection" />
-                                <HistorySelectionStatus
-                                    v-if="showSelection"
-                                    :selection-size="selectionSize"
-                                    @select-all="selectAllInCurrentQuery(itemsLoaded)"
-                                    @reset-selection="resetSelection" />
-                            </template>
-                        </HistoryOperations>
-                        <SelectionChangeWarning :query-selection-break="querySelectionBreak" />
-                        <OperationErrorDialog
-                            v-if="operationError"
-                            :operation-error="operationError"
-                            @hide="operationError = null" />
-                    </section>
-                    <section v-if="!showAdvanced" class="position-relative flex-grow-1 scroller">
-                        <history-drop-zone v-if="showDropZone" />
-                        <div>
-                            <div v-if="loading && itemsLoaded && itemsLoaded.length === 0">
-                                <b-alert class="m-2" variant="info" show>
-                                    <LoadingSpan message="Loading History" />
-                                </b-alert>
-                            </div>
-                            <b-alert v-else-if="isProcessing" class="m-2" variant="info" show>
-                                <LoadingSpan message="Processing operation" />
-                            </b-alert>
-                            <div v-else-if="itemsLoaded.length === 0">
-                                <HistoryEmpty v-if="queryDefault" class="m-2" />
-                                <b-alert v-else class="m-2" variant="info" show>
-                                    No data found for selected filter.
-                                </b-alert>
-                            </div>
-                            <ListingLayout
-                                v-else
-                                :offset="listOffset"
-                                :items="itemsLoaded"
-                                :query-key="queryKey"
-                                @scroll="onScroll">
-                                <template v-slot:item="{ item, currentOffset }">
-                                    <ContentItem
-                                        v-if="!invisible[item.hid]"
-                                        :id="item.hid"
-                                        is-history-item
-                                        :item="item"
-                                        :name="item.name"
-                                        :writable="writable"
-                                        :expand-dataset="isExpanded(item)"
-                                        :is-dataset="isDataset(item)"
-                                        :highlight="getHighlight(item)"
-                                        :selected="isSelected(item)"
-                                        :selectable="showSelection"
-                                        @tag-click="onTagClick"
-                                        @tag-change="onTagChange"
-                                        @toggleHighlights="toggleHighlights"
-                                        @update:expand-dataset="setExpanded(item, $event)"
-                                        @update:selected="setSelected(item, $event)"
-                                        @view-collection="$emit('view-collection', item, currentOffset)"
-                                        @delete="onDelete(item)"
-                                        @undelete="onUndelete(item)"
-                                        @unhide="onUnhide(item)" />
-                                </template>
-                            </ListingLayout>
-                        </div>
-                    </section>
+                        @reloadContents="reloadContents" />
+                    <HistoryOperations
+                        v-if="showControls"
+                        :history="history"
+                        :show-selection="showSelection"
+                        :expanded-count="expandedCount"
+                        :has-matches="hasMatches(itemsLoaded)"
+                        :operation-running.sync="operationRunning"
+                        @update:show-selection="setShowSelection"
+                        @collapse-all="collapseAll">
+                        <template v-slot:selection-operations>
+                            <HistorySelectionOperations
+                                :history="history"
+                                :filter-text="filterText"
+                                :content-selection="selectedItems"
+                                :selection-size="selectionSize"
+                                :is-query-selection="isQuerySelection"
+                                :total-items-in-query="totalItemsInQuery"
+                                :operation-running.sync="operationRunning"
+                                @update:show-selection="setShowSelection"
+                                @operation-error="onOperationError"
+                                @hide-selection="onHideSelection"
+                                @reset-selection="resetSelection" />
+                            <HistorySelectionStatus
+                                v-if="showSelection"
+                                :selection-size="selectionSize"
+                                @select-all="selectAllInCurrentQuery(itemsLoaded)"
+                                @reset-selection="resetSelection" />
+                        </template>
+                    </HistoryOperations>
+                    <SelectionChangeWarning :query-selection-break="querySelectionBreak" />
+                    <OperationErrorDialog
+                        v-if="operationError"
+                        :operation-error="operationError"
+                        @hide="operationError = null" />
                 </section>
-            </SelectedItems>
-        </ExpandedItems>
-    </HistoryItemsProvider>
+                <section v-if="!showAdvanced" class="position-relative flex-grow-1 scroller">
+                    <history-drop-zone v-if="showDropZone" />
+                    <div>
+                        <div v-if="loading && itemsLoaded && itemsLoaded.length === 0">
+                            <b-alert class="m-2" variant="info" show>
+                                <LoadingSpan message="Loading History" />
+                            </b-alert>
+                        </div>
+                        <b-alert v-else-if="isProcessing" class="m-2" variant="info" show>
+                            <LoadingSpan message="Processing operation" />
+                        </b-alert>
+                        <div v-else-if="itemsLoaded.length === 0">
+                            <HistoryEmpty v-if="queryDefault" class="m-2" />
+                            <b-alert v-else class="m-2" variant="info" show>
+                                No data found for selected filter.
+                            </b-alert>
+                        </div>
+                        <ListingLayout
+                            v-else
+                            :offset="listOffset"
+                            :items="itemsLoaded"
+                            :query-key="queryKey"
+                            @scroll="onScroll">
+                            <template v-slot:item="{ item, currentOffset }">
+                                <ContentItem
+                                    v-if="!invisible[item.hid]"
+                                    :id="item.hid"
+                                    is-history-item
+                                    :item="item"
+                                    :name="item.name"
+                                    :writable="writable"
+                                    :expand-dataset="isExpanded(item)"
+                                    :is-dataset="isDataset(item)"
+                                    :highlight="getHighlight(item)"
+                                    :selected="isSelected(item)"
+                                    :selectable="showSelection"
+                                    :filterable="filterable"
+                                    @tag-click="onTagClick"
+                                    @tag-change="onTagChange"
+                                    @toggleHighlights="toggleHighlights"
+                                    @update:expand-dataset="setExpanded(item, $event)"
+                                    @update:selected="setSelected(item, $event)"
+                                    @view-collection="$emit('view-collection', item, currentOffset)"
+                                    @delete="onDelete(item)"
+                                    @undelete="onUndelete(item)"
+                                    @unhide="onUnhide(item)" />
+                            </template>
+                        </ListingLayout>
+                    </div>
+                </section>
+            </section>
+        </SelectedItems>
+    </ExpandedItems>
 </template>
 
 <script>
 import Vue from "vue";
 import { Toast } from "composables/toast";
-import { mapActions } from "vuex";
-import { HistoryItemsProvider } from "components/providers/storeProviders";
+import { mapActions as vuexMapActions } from "vuex";
+import { mapActions, mapState, storeToRefs } from "pinia";
+import { useHistoryItemsStore } from "stores/history/historyItemsStore";
 import LoadingSpan from "components/LoadingSpan";
 import ContentItem from "components/History/Content/ContentItem";
 import { deleteContent, updateContentFields } from "components/History/model/queries";
-import { getHighlights } from "components/History/Content/model/highlights";
 import ExpandedItems from "components/History/Content/ExpandedItems";
 import SelectedItems from "components/History/Content/SelectedItems";
 import ListingLayout from "components/History/Layout/ListingLayout";
@@ -178,7 +171,6 @@ export default {
         HistoryDropZone,
         HistoryEmpty,
         HistoryFilters,
-        HistoryItemsProvider,
         HistoryOperations,
         HistorySelectionOperations,
         HistorySelectionStatus,
@@ -194,13 +186,15 @@ export default {
         filter: { type: String, default: "" },
         writable: { type: Boolean, default: true },
         showControls: { type: Boolean, default: true },
+        filterable: { type: Boolean, default: false },
     },
     data() {
         return {
+            error: null,
             filterText: "",
-            highlights: {},
             highlightsKey: null,
             invisible: {},
+            loading: false,
             offset: 0,
             showAdvanced: false,
             showDropZone: false,
@@ -210,10 +204,15 @@ export default {
         };
     },
     computed: {
+        ...mapState(useHistoryItemsStore, ["getHistoryItems"]),
         /** @returns {String} */
         historyId() {
             return this.history.id;
         },
+        /** @returns {Date} */
+        historyUpdateTime() {
+            return this.history.update_time;
+        },
         /** @returns {String} */
         queryKey() {
             return `${this.historyId}-${this.filterText}`;
@@ -230,37 +229,67 @@ export default {
         isProcessing() {
             return this.operationRunning >= this.history.update_time;
         },
+        /** @returns {Array} */
+        itemsLoaded() {
+            return this.getHistoryItems(this.historyId, this.filterText);
+        },
         /** @returns {Date} */
         lastChecked() {
-            return this.$store.getters.getLastCheckedTime();
+            const { getLastCheckedTime } = storeToRefs(useHistoryItemsStore());
+            return getLastCheckedTime.value;
         },
+        /** @returns {Number} */
+        totalItemsInQuery() {
+            const { getTotalMatchesCount } = storeToRefs(useHistoryItemsStore());
+            return getTotalMatchesCount.value;
+        },
+        /** @returns {Boolean} */
         isWatching() {
-            return this.$store.getters.getWatchingVisibility();
+            const { getWatchingVisibility } = storeToRefs(useHistoryItemsStore());
+            return getWatchingVisibility.value;
         },
     },
     watch: {
         queryKey() {
             this.invisible = {};
             this.offset = 0;
-            this.resetHighlights();
+            this.loadHistoryItems();
         },
         historyId(newVal, oldVal) {
             if (newVal !== oldVal) {
                 this.operationRunning = null;
-                this.resetHighlights();
             }
         },
         filter(newVal) {
             this.filterText = newVal;
         },
+        offset() {
+            this.loadHistoryItems();
+        },
+        historyUpdateTime() {
+            this.loadHistoryItems();
+        },
+    },
+    async mounted() {
+        await this.loadHistoryItems();
     },
     methods: {
-        ...mapActions("history", ["loadHistoryById"]),
+        ...vuexMapActions("history", ["loadHistoryById"]),
+        ...mapActions(useHistoryItemsStore, ["fetchHistoryItems"]),
         getHighlight(item) {
-            return this.highlights[this.getItemKey(item)];
-        },
-        getItemKey(item) {
-            return `${item.id}-${item.history_content_type}`;
+            if (this.filterText.includes("related:" + item.hid)) {
+                this.highlightsKey = item.hid;
+                return "active";
+            } else if (this.filterText.includes("related:") && this.highlightsKey) {
+                if (item.hid > this.highlightsKey) {
+                    return "output";
+                } else {
+                    return "input";
+                }
+            } else {
+                this.highlightsKey = null;
+                return null;
+            }
         },
         hasMatches(items) {
             return !!items && items.length > 0;
@@ -268,6 +297,18 @@ export default {
         isDataset(item) {
             return item.history_content_type == "dataset";
         },
+        async loadHistoryItems() {
+            this.loading = true;
+            try {
+                await this.fetchHistoryItems(this.historyId, this.filterText, this.offset);
+                this.error = null;
+                this.loading = false;
+            } catch (error) {
+                console.debug("HistoryPanel - Load error.", error);
+                this.error = error;
+                this.loading = false;
+            }
+        },
         onDelete(item) {
             this.setInvisible(item);
             deleteContent(item);
@@ -308,19 +349,13 @@ export default {
             console.debug("HistoryPanel - Operation error.", error);
             this.operationError = error;
         },
-        async toggleHighlights(item) {
-            const key = this.getItemKey(item);
-            if (this.highlightsKey != key) {
-                this.highlightsKey = key;
-                this.highlights = await getHighlights(item, key);
+        toggleHighlights(item) {
+            if (this.filterText == "related:" + item.hid) {
+                this.filterText = "";
             } else {
-                this.resetHighlights();
+                this.filterText = "related:" + item.hid;
             }
         },
-        resetHighlights() {
-            this.highlights = {};
-            this.highlightsKey = null;
-        },
         onDragEnter(e) {
             this.dragTarget = e.target;
             this.showDropZone = true;
diff --git a/client/src/components/History/Export/ExportOptions.vue b/client/src/components/History/Export/ExportOptions.vue
new file mode 100644
index 00000000000..baa9f60c2c1
--- /dev/null
+++ b/client/src/components/History/Export/ExportOptions.vue
@@ -0,0 +1,80 @@
+<script setup>
+import { computed, reactive, ref } from "vue";
+import { BCard, BFormSelect, BFormCheckbox, BFormGroup, BCollapse, BLink } from "bootstrap-vue";
+import { ExportParamsModel } from "components/Common/models/exportRecordModel";
+import { AVAILABLE_EXPORT_FORMATS } from "./services";
+
+const props = defineProps({
+    exportParams: {
+        type: ExportParamsModel,
+        required: true,
+    },
+});
+
+const emit = defineEmits(["onValueChanged"]);
+
+const isExpanded = ref(false);
+const title = computed(() => (isExpanded.value ? `Hide advanced export options` : `Show advanced export options`));
+const localOptions = reactive({
+    modelStoreFormat: props.exportParams.modelStoreFormat,
+    includeFiles: props.exportParams.includeFiles,
+    includeDeleted: props.exportParams.includeDeleted,
+    includeHidden: props.exportParams.includeHidden,
+});
+
+function onValueChanged() {
+    emit("onValueChanged", localOptions);
+}
+</script>
+
+<template>
+    <div>
+        <b-link
+            id="toggle-options-link"
+            :class="isExpanded ? null : 'collapsed'"
+            :aria-expanded="isExpanded ? 'true' : 'false'"
+            aria-controls="collapse-options"
+            @click="isExpanded = !isExpanded">
+            {{ title }}
+        </b-link>
+        <b-collapse id="collapse-options" v-model="isExpanded">
+            <b-card>
+                <b-form-group label="Export Format:" label-for="format">
+                    <b-form-select
+                        id="format-selector"
+                        v-model="localOptions.modelStoreFormat"
+                        :options="AVAILABLE_EXPORT_FORMATS"
+                        value-field="id"
+                        text-field="name"
+                        @change="onValueChanged" />
+                </b-form-group>
+
+                <b-form-group label="Dataset files included in the package:">
+                    <b-form-checkbox
+                        id="include-files-check"
+                        v-model="localOptions.includeFiles"
+                        switch
+                        @change="onValueChanged">
+                        Include Active
+                    </b-form-checkbox>
+
+                    <b-form-checkbox
+                        id="include-deleted-check"
+                        v-model="localOptions.includeDeleted"
+                        switch
+                        @change="onValueChanged">
+                        Include Deleted (not purged)
+                    </b-form-checkbox>
+
+                    <b-form-checkbox
+                        id="include-hidden-check"
+                        v-model="localOptions.includeHidden"
+                        switch
+                        @change="onValueChanged">
+                        Include Hidden
+                    </b-form-checkbox>
+                </b-form-group>
+            </b-card>
+        </b-collapse>
+    </div>
+</template>
diff --git a/client/src/components/History/Export/HistoryExport.test.ts b/client/src/components/History/Export/HistoryExport.test.ts
new file mode 100644
index 00000000000..e2ec1de4f38
--- /dev/null
+++ b/client/src/components/History/Export/HistoryExport.test.ts
@@ -0,0 +1,103 @@
+import { shallowMount } from "@vue/test-utils";
+import axios from "axios";
+import MockAdapter from "axios-mock-adapter";
+import {
+    EXPIRED_STS_DOWNLOAD_RECORD,
+    FILE_SOURCE_STORE_RECORD,
+    RECENT_STS_DOWNLOAD_RECORD,
+} from "@/components/Common/models/testData/exportData";
+import flushPromises from "flush-promises";
+import type { components } from "@/schema";
+import { getLocalVue } from "../../../../tests/jest/helpers";
+import HistoryExport from "./HistoryExport.vue";
+import { getExportRecords } from "./services";
+
+const localVue = getLocalVue(true);
+
+jest.mock("./services");
+const mockGetExportRecords = getExportRecords as jest.MockedFunction<typeof getExportRecords>;
+mockGetExportRecords.mockResolvedValue([]);
+
+const FAKE_HISTORY_ID = "fake-history-id";
+const REMOTE_FILES_API_ENDPOINT = new RegExp("/api/remote_files/plugins");
+
+type FilesSourcePluginList = components["schemas"]["FilesSourcePlugin"][];
+const REMOTE_FILES_API_RESPONSE: FilesSourcePluginList = [
+    {
+        id: "test-posix-source",
+        type: "posix",
+        uri_root: "gxfiles://test-posix-source",
+        label: "TestSource",
+        doc: "For testing",
+        writable: true,
+        requires_roles: undefined,
+        requires_groups: undefined,
+    },
+];
+
+async function mountHistoryExport() {
+    const wrapper = shallowMount(HistoryExport, {
+        propsData: { historyId: FAKE_HISTORY_ID },
+        localVue,
+    });
+    await flushPromises();
+    return wrapper;
+}
+
+describe("HistoryExport.vue", () => {
+    let axiosMock: MockAdapter;
+
+    beforeEach(async () => {
+        axiosMock = new MockAdapter(axios);
+        axiosMock.onGet(REMOTE_FILES_API_ENDPOINT).reply(200, []);
+    });
+
+    afterEach(() => {
+        axiosMock.restore();
+    });
+
+    it("should render export options", async () => {
+        const wrapper = await mountHistoryExport();
+
+        expect(wrapper.find("#history-export-options").exists()).toBe(true);
+    });
+
+    it("should display a message indicating there are no exports where there are none", async () => {
+        const wrapper = await mountHistoryExport();
+
+        expect(wrapper.find("#no-export-records-alert").exists()).toBe(true);
+    });
+
+    it("should render previous records when there is more than one record", async () => {
+        mockGetExportRecords.mockResolvedValue([
+            RECENT_STS_DOWNLOAD_RECORD,
+            FILE_SOURCE_STORE_RECORD,
+            EXPIRED_STS_DOWNLOAD_RECORD,
+        ]);
+        const wrapper = await mountHistoryExport();
+
+        expect(wrapper.find("#previous-export-records").exists()).toBe(true);
+    });
+
+    it("should not render previous records when there is one or less records", async () => {
+        mockGetExportRecords.mockResolvedValue([RECENT_STS_DOWNLOAD_RECORD]);
+        const wrapper = await mountHistoryExport();
+
+        expect(wrapper.find("#previous-export-records").exists()).toBe(false);
+    });
+
+    it("should display file sources tab if there are available", async () => {
+        axiosMock.onGet(REMOTE_FILES_API_ENDPOINT).reply(200, REMOTE_FILES_API_RESPONSE);
+        const wrapper = await mountHistoryExport();
+
+        expect(wrapper.find("#direct-download-tab").exists()).toBe(true);
+        expect(wrapper.find("#file-source-tab").exists()).toBe(true);
+    });
+
+    it("should not display file sources tab if there are no file sources available", async () => {
+        const wrapper = await mountHistoryExport();
+
+        expect(wrapper.find("#direct-download-tab").exists()).toBe(true);
+        expect(wrapper.find("#file-source-tab").exists()).toBe(false);
+    });
+});
diff --git a/client/src/components/History/Export/HistoryExport.vue b/client/src/components/History/Export/HistoryExport.vue
new file mode 100644
index 00000000000..36d908af4d3
--- /dev/null
+++ b/client/src/components/History/Export/HistoryExport.vue
@@ -0,0 +1,202 @@
+<script setup>
+import { computed, ref, reactive, onMounted, watch } from "vue";
+import { BAlert, BCard, BButton, BTab, BTabs } from "bootstrap-vue";
+import LoadingSpan from "components/LoadingSpan";
+import ExportRecordDetails from "components/Common/ExportRecordDetails.vue";
+import ExportRecordTable from "components/Common/ExportRecordTable.vue";
+import ExportOptions from "./ExportOptions.vue";
+import ExportToFileSourceForm from "components/Common/ExportForm.vue";
+import { getExportRecords, exportToFileSource, reimportHistoryFromRecord } from "./services";
+import { useTaskMonitor } from "composables/taskMonitor";
+import { useFileSources } from "composables/fileSources";
+import { useShortTermStorage, DEFAULT_EXPORT_PARAMS } from "composables/shortTermStorage";
+import { useConfirmDialog } from "composables/confirmDialog";
+
+const { isRunning: isExportTaskRunning, waitForTask } = useTaskMonitor();
+const { hasWritable: hasWritableFileSources } = useFileSources();
+const { isPreparing: isPreparingDownload, downloadHistory, downloadObjectByRequestId } = useShortTermStorage();
+const { confirm } = useConfirmDialog();
+
+const props = defineProps({
+    historyId: {
+        type: String,
+        required: true,
+    },
+});
+
+const exportParams = reactive(DEFAULT_EXPORT_PARAMS);
+const isLoadingRecords = ref(true);
+const exportRecords = ref(null);
+const latestExportRecord = computed(() => (exportRecords.value?.length ? exportRecords.value.at(0) : null));
+const previousExportRecords = computed(() => (exportRecords.value ? exportRecords.value.slice(1) : null));
+const hasPreviousExports = computed(() => previousExportRecords.value?.length > 0);
+const availableRecordsMessage = computed(() =>
+    isLoadingRecords.value
+        ? "Loading export records..."
+        : "This history has no export records yet. You can choose one of the export options above."
+);
+const errorMessage = ref(null);
+const actionMessage = ref(null);
+const actionMessageVariant = ref(null);
+
+onMounted(async () => {
+    updateExports();
+});
+
+watch(isExportTaskRunning, (newValue, oldValue) => {
+    const hasFinished = oldValue && !newValue;
+    if (hasFinished) {
+        updateExports();
+    }
+});
+
+async function updateExports() {
+    isLoadingRecords.value = true;
+    try {
+        errorMessage.value = null;
+        exportRecords.value = await getExportRecords(props.historyId);
+        const shouldWaitForTask = latestExportRecord.value?.isPreparing && !isExportTaskRunning.value;
+        if (shouldWaitForTask) {
+            waitForTask(latestExportRecord.value.taskUUID, 3000);
+        }
+    } catch (error) {
+        errorMessage.value = error;
+    }
+    isLoadingRecords.value = false;
+}
+
+async function doExportToFileSource(exportDirectory, fileName) {
+    await exportToFileSource(props.historyId, exportDirectory, fileName, exportParams);
+    updateExports();
+}
+
+async function prepareDownload() {
+    const upToDateDownloadRecord = findValidUpToDateDownloadRecord();
+    if (upToDateDownloadRecord) {
+        downloadObjectByRequestId(upToDateDownloadRecord.stsDownloadId);
+        return;
+    }
+    await downloadHistory(props.historyId, { pollDelayInMs: 3000, exportParams: exportParams });
+    updateExports();
+}
+
+function downloadFromRecord(record) {
+    if (record.canDownload) {
+        downloadObjectByRequestId(record.stsDownloadId);
+    }
+}
+
+function findValidUpToDateDownloadRecord() {
+    return exportRecords.value
+        ? exportRecords.value.find(
+              (record) => record.canDownload && record.isUpToDate && record.exportParams?.equals(exportParams)
+          )
+        : null;
+}
+
+async function reimportFromRecord(record) {
+    const confirmed = await confirm(
+        `Do you really want to import a new copy of this history exported ${record.elapsedTime}?`
+    );
+    if (confirmed) {
+        reimportHistoryFromRecord(record)
+            .then(() => {
+                actionMessageVariant.value = "info";
+                actionMessage.value =
+                    "The history is being imported in the background. Check your histories after a while to find it.";
+            })
+            .catch((reason) => {
+                actionMessageVariant.value = "danger";
+                actionMessage.value = reason;
+            });
+    }
+}
+
+function onActionMessageDismissedFromRecord() {
+    actionMessage.value = null;
+    actionMessageVariant.value = null;
+}
+
+function updateExportParams(newParams) {
+    exportParams.modelStoreFormat = newParams.modelStoreFormat;
+    exportParams.includeFiles = newParams.includeFiles;
+    exportParams.includeDeleted = newParams.includeDeleted;
+    exportParams.includeHidden = newParams.includeHidden;
+}
+</script>
+<template>
+    <span class="history-export-component">
+        <h1 class="h-lg">Export history {{ props.historyId }}</h1>
+
+        <export-options
+            id="history-export-options"
+            :export-params="exportParams"
+            @onValueChanged="updateExportParams" />
+
+        <b-card no-body class="mt-3">
+            <b-tabs pills card>
+                <b-tab id="direct-download-tab" title="to direct download" title-link-class="tab-export-to-link" active>
+                    <p>
+                        Here you can generate a temporal download for your history. When your download link expires or
+                        your history changes you can re-generate it again.
+                    </p>
+                    <b-alert show variant="warning">
+                        History archive downloads can expire and are removed at regular intervals. For permanent
+                        storage, export to a <b>remote file</b> or download and then import the archive on another
+                        Galaxy server.
+                    </b-alert>
+                    <b-button
+                        class="direct-download-btn"
+                        :disabled="isPreparingDownload"
+                        variant="primary"
+                        @click="prepareDownload">
+                        Download
+                    </b-button>
+                    <span v-if="isPreparingDownload">
+                        <loading-span message="Galaxy is preparing your download, this will likely take a while" />
+                    </span>
+                </b-tab>
+                <b-tab
+                    v-if="hasWritableFileSources"
+                    id="file-source-tab"
+                    title="to remote file"
+                    title-link-class="tab-export-to-file">
+                    <p>
+                        If you need a "more permanent" way of storing your history archive you can export it directly to
+                        one of the available remote file sources here. You will be able to re-import it later as long as
+                        it remains available on the remote server.
+                    </p>
+                    <export-to-file-source-form
+                        what="history"
+                        :clear-input-after-export="true"
+                        @export="doExportToFileSource" />
+                </b-tab>
+            </b-tabs>
+        </b-card>
+
+        <export-record-details
+            v-if="latestExportRecord"
+            :record="latestExportRecord"
+            object-type="history"
+            class="mt-3"
+            :action-message="actionMessage"
+            :action-message-variant="actionMessageVariant"
+            @onDownload="downloadFromRecord"
+            @onReimport="reimportFromRecord"
+            @onActionMessageDismissed="onActionMessageDismissedFromRecord" />
+        <b-alert v-else-if="errorMessage" id="last-export-record-error-alert" variant="danger" class="mt-3" show>
+            {{ errorMessage }}
+        </b-alert>
+        <b-alert v-else id="no-export-records-alert" variant="info" class="mt-3" show>
+            {{ availableRecordsMessage }}
+        </b-alert>
+
+        <export-record-table
+            v-if="hasPreviousExports"
+            id="previous-export-records"
+            :records="previousExportRecords"
+            class="mt-3"
+            @onDownload="downloadFromRecord"
+            @onReimport="reimportFromRecord" />
+    </span>
+</template>
diff --git a/client/src/components/History/Export/services.ts b/client/src/components/History/Export/services.ts
new file mode 100644
index 00000000000..8798ae05e23
--- /dev/null
+++ b/client/src/components/History/Export/services.ts
@@ -0,0 +1,77 @@
+import { ExportRecordModel } from "@/components/Common/models/exportRecordModel";
+import type { ObjectExportTaskResponse } from "@/components/Common/models/exportRecordModel";
+import { DEFAULT_EXPORT_PARAMS } from "@/composables/shortTermStorage";
+import type { components } from "@/schema";
+import { fetcher } from "@/schema";
+
+type ModelStoreFormat = components["schemas"]["ModelStoreFormat"];
+
+const _getExportRecords = fetcher.path("/api/histories/{history_id}/exports").method("get").create();
+const _exportToFileSource = fetcher.path("/api/histories/{history_id}/write_store").method("post").create();
+const _importFromStoreAsync = fetcher.path("/api/histories/from_store_async").method("post").create();
+
+/**
+ * A list of objects with the available export formats IDs and display names.
+ */
+export const AVAILABLE_EXPORT_FORMATS: { id: ModelStoreFormat; name: string }[] = [
+    { id: "rocrate.zip", name: "RO-Crate" },
+    { id: "tar.gz", name: "Compressed TGZ" },
+];
+
+/**
+ * Gets a list of export records for the given history.
+ * @param historyId the encoded ID of the history
+ * @param params query and pagination params
+ * @returns a promise with a list of export records associated with the given history.
+ */
+export async function getExportRecords(historyId: string) {
+    const response = await _getExportRecords(
+        {
+            history_id: historyId,
+        },
+        {
+            headers: {
+                Accept: "application/vnd.galaxy.task.export+json",
+            },
+        }
+    );
+    return response.data.map((item: unknown) => new ExportRecordModel(item as ObjectExportTaskResponse));
+}
+
+/**
+ *
+ * @param historyId the encoded ID of the history
+ * @param exportDirectory the output directory in the file source
+ * @param fileName the name of the output archive
+ * @param exportParams additional parameters to configure the export
+ * @returns A promise with the request response
+ */
+export async function exportToFileSource(
+    historyId: string,
+    exportDirectory: string,
+    fileName: string,
+    exportParams = DEFAULT_EXPORT_PARAMS
+) {
+    const exportDirectoryUri = `${exportDirectory}/${fileName}.${exportParams.modelStoreFormat}`;
+
+    return _exportToFileSource({
+        history_id: historyId,
+        target_uri: exportDirectoryUri,
+        model_store_format: exportParams.modelStoreFormat as ModelStoreFormat,
+        include_files: exportParams.includeFiles,
+        include_deleted: exportParams.includeDeleted,
+        include_hidden: exportParams.includeHidden,
+    });
+}
+
+/**
+ * Imports a new history using the information stored in the given export record.
+ * @param record The export record to be imported
+ * @returns A promise with the request response
+ */
+export async function reimportHistoryFromRecord(record: ExportRecordModel) {
+    return _importFromStoreAsync({
+        store_content_uri: record.importUri,
+        model_store_format: record.modelStoreFormat,
+    });
+}
diff --git a/client/src/components/History/HistoryFilters.js b/client/src/components/History/HistoryFilters.js
new file mode 100644
index 00000000000..e8d9dd9bb8e
--- /dev/null
+++ b/client/src/components/History/HistoryFilters.js
@@ -0,0 +1,28 @@
+import Filtering, { compare, contains, equals, expandNameTag, toBool, toDate } from "utils/filtering";
+
+export const validFilters = {
+    hid: equals("hid"),
+    state: equals("state"),
+    name: contains("name"),
+    extension: equals("extension"),
+    hid_ge: compare("hid", "ge"),
+    hid_gt: compare("hid", "gt"),
+    hid_le: compare("hid", "le"),
+    hid_lt: compare("hid", "lt"),
+    related: equals("related"),
+    tag: contains("tags", "tag", expandNameTag),
+    visible: equals("visible", "visible", toBool),
+    deleted: equals("deleted", "deleted", toBool),
+    create_time: compare("create_time", "le", toDate),
+    create_time_ge: compare("create_time", "ge", toDate),
+    create_time_gt: compare("create_time", "gt", toDate),
+    create_time_le: compare("create_time", "le", toDate),
+    create_time_lt: compare("create_time", "lt", toDate),
+    update_time: compare("update_time", "le", toDate),
+    update_time_ge: compare("update_time", "ge", toDate),
+    update_time_gt: compare("update_time", "gt", toDate),
+    update_time_le: compare("update_time", "le", toDate),
+    update_time_lt: compare("update_time", "lt", toDate),
+};
+
+export const HistoryFilters = new Filtering(validFilters, true);
diff --git a/client/src/components/History/HistoryPublishedList.vue b/client/src/components/History/HistoryPublishedList.vue
index d7f3a2dc1bd..5eb78a5dbae 100644
--- a/client/src/components/History/HistoryPublishedList.vue
+++ b/client/src/components/History/HistoryPublishedList.vue
@@ -1,13 +1,20 @@
 <script setup>
 import UtcDate from "components/UtcDate";
 import Tags from "components/Common/Tags";
-import { safePath } from "utils/redirect";
 import { computed, ref, watch } from "vue";
 import Heading from "components/Common/Heading";
 import LoadingSpan from "components/LoadingSpan";
 import DebouncedInput from "components/DebouncedInput";
 import { getPublishedHistories, updateTags } from "./services";
-import { getFilters, getFilterText, toAlias } from "utils/filterConversion";
+import Filtering, { contains, expandNameTag } from "utils/filtering";
+
+const validFilters = {
+    name: contains("name"),
+    annotation: contains("annotation"),
+    tag: contains("tags", "tag", expandNameTag),
+};
+
+const filters = new Filtering(validFilters, false);
 
 const limit = ref(50);
 const offset = ref(0);
@@ -43,7 +50,7 @@ const localFilter = computed({
     },
 });
 
-const filterSettings = computed(() => toAlias(getFilters(filterText.value, false)));
+const filterSettings = computed(() => filters.toAlias(filters.getFilters(filterText.value)));
 
 const updateFilter = (newVal, append = false) => {
     let oldValue = filterText.value;
@@ -69,13 +76,17 @@ const onTagClick = (tag) => {
 
 const load = async () => {
     loading.value = true;
-    getPublishedHistories({
-        limit: limit.value,
-        offset: offset.value,
-        sortBy: sortBy.value,
-        sortDesc: sortDesc.value,
-        filterText: filterText.value,
-    })
+
+    getPublishedHistories(
+        {
+            limit: limit.value,
+            offset: offset.value,
+            sortBy: sortBy.value,
+            sortDesc: sortDesc.value,
+            filterText: filterText.value,
+        },
+        filters
+    )
         .then((data) => {
             items.value = data;
         })
@@ -98,7 +109,7 @@ const onToggle = () => {
 
 const onSearch = () => {
     onToggle();
-    updateFilter(getFilterText(filterSettings.value));
+    updateFilter(filters.getFilterText(filterSettings.value));
 };
 
 load();
@@ -204,7 +215,7 @@ watch([filterText, sortBy, sortDesc], () => {
                 :sort-by.sync="sortBy"
                 :sort-desc.sync="sortDesc">
                 <template v-slot:cell(name)="row">
-                    <router-link :to="safePath(`/published/history?id=${row.item.id}`)">
+                    <router-link :to="`/published/history?id=${row.item.id}`">
                         {{ row.item.name }}
                     </router-link>
                 </template>
diff --git a/client/src/components/History/Index.vue b/client/src/components/History/Index.vue
index da6677092f2..91aff574db1 100644
--- a/client/src/components/History/Index.vue
+++ b/client/src/components/History/Index.vue
@@ -6,6 +6,7 @@
                     v-if="!breadcrumbs.length"
                     :list-offset="listOffset"
                     :history="currentHistory"
+                    :filterable="true"
                     v-on="handlers"
                     @view-collection="onViewCollection">
                     <template v-slot:navigation>
diff --git a/client/src/components/History/Layout/DetailsLayout.test.js b/client/src/components/History/Layout/DetailsLayout.test.js
index 9e474c0b45d..4fa81342aef 100644
--- a/client/src/components/History/Layout/DetailsLayout.test.js
+++ b/client/src/components/History/Layout/DetailsLayout.test.js
@@ -1,4 +1,4 @@
-import { mockModule, getLocalVue } from "jest/helpers";
+import { mockModule, getLocalVue } from "tests/jest/helpers";
 import { userStore } from "store/userStore";
 import Vuex from "vuex";
 import DetailsLayout from "./DetailsLayout";
diff --git a/client/src/components/History/Layout/DetailsLayout.vue b/client/src/components/History/Layout/DetailsLayout.vue
index 629388419b3..df5219098f2 100644
--- a/client/src/components/History/Layout/DetailsLayout.vue
+++ b/client/src/components/History/Layout/DetailsLayout.vue
@@ -67,7 +67,7 @@
 <script>
 import { mapGetters } from "vuex";
 import short from "components/directives/v-short";
-import { StatelessTags } from "components/Tags";
+import StatelessTags from "components/TagsMultiselect/StatelessTags";
 
 export default {
     components: {
diff --git a/client/src/components/History/Layout/ListingLayout.vue b/client/src/components/History/Layout/ListingLayout.vue
index b66be94135f..8f9bc79003e 100644
--- a/client/src/components/History/Layout/ListingLayout.vue
+++ b/client/src/components/History/Layout/ListingLayout.vue
@@ -20,7 +20,6 @@
 </template>
 <script>
 import VirtualList from "vue-virtual-scroll-list";
-import { throttle } from "lodash";
 import LoadingSpan from "components/LoadingSpan";
 
 export default {
@@ -36,8 +35,7 @@ export default {
     },
     data() {
         return {
-            throttlePeriod: 20,
-            deltaMax: 20,
+            previousStart: undefined,
         };
     },
     watch: {
@@ -45,37 +43,13 @@ export default {
             this.$refs.listing.scrollToOffset(0);
         },
     },
-    created() {
-        this.onScrollThrottle = throttle((event) => {
-            this.onScroll(event);
-        }, this.throttlePeriod);
-    },
     methods: {
-        onScrollHandler(event) {
-            /* CURRENTLY UNUSED
-            // this avoids diagonal scrolling, we either scroll left/right or top/down
-            // both events are throttled and the default handler has been prevented.
-            if (Math.abs(event.deltaY) > Math.abs(event.deltaX)) {
-                // handle vertical scrolling with virtual scroller
-                const listing = this.$refs.listing;
-                const deltaMax = this.deltaMax;
-                const deltaY = Math.max(Math.min(event.deltaY, deltaMax), -deltaMax);
-                this.offset = Math.max(0, listing.getOffset() + deltaY);
-                this.$refs.listing.scrollToOffset(this.offset);
-            } else {
-                // dispatch horizontal scrolling as regular event
-                var wheelEvent = new WheelEvent("wheel", {
-                    deltaX: event.deltaX,
-                    bubbles: true,
-                    cancelable: false,
-                });
-                event.target.dispatchEvent(wheelEvent);
-            }
-            */
-        },
         onScroll() {
             const rangeStart = this.$refs.listing.range.start;
-            this.$emit("scroll", rangeStart);
+            if (this.previousStart !== rangeStart) {
+                this.previousStart = rangeStart;
+                this.$emit("scroll", rangeStart);
+            }
         },
         getOffset() {
             return this.$refs.listing?.getOffset() || 0;
diff --git a/client/src/components/History/Modals/SelectorModal.test.js b/client/src/components/History/Modals/SelectorModal.test.js
index ff426390176..bc026247c84 100644
--- a/client/src/components/History/Modals/SelectorModal.test.js
+++ b/client/src/components/History/Modals/SelectorModal.test.js
@@ -1,6 +1,6 @@
 import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import SelectorModal from "./SelectorModal";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/History/Multiple/MultipleView.test.js b/client/src/components/History/Multiple/MultipleView.test.js
index bafaa10556e..05e3d128dee 100644
--- a/client/src/components/History/Multiple/MultipleView.test.js
+++ b/client/src/components/History/Multiple/MultipleView.test.js
@@ -1,11 +1,13 @@
 import { createPinia } from "pinia";
 import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue, mockModule } from "tests/jest/helpers";
 import MultipleView from "./MultipleView";
 import MockCurrentUser from "components/providers/MockCurrentUser";
 import MockUserHistories from "components/providers/MockUserHistories";
-import store from "store/index";
+import Vuex from "vuex";
+import { userStore } from "store/userStore";
+import { historyStore } from "store/historyStore";
 
 const COUNT = 8;
 const USER_ID = "test-user-id";
@@ -23,8 +25,8 @@ const getFakeHistorySummaries = (num, selectedIndex = 0) => {
     result[selectedIndex].id = CURRENT_HISTORY_ID;
     return result;
 };
-
-const CurrentUserMock = MockCurrentUser({ id: USER_ID });
+const currentUser = { id: USER_ID };
+const CurrentUserMock = MockCurrentUser(currentUser);
 const UserHistoriesMock = MockUserHistories({ id: CURRENT_HISTORY_ID }, getFakeHistorySummaries(COUNT, 0), false);
 
 const localVue = getLocalVue();
@@ -33,6 +35,22 @@ describe("MultipleView", () => {
     let wrapper;
 
     beforeEach(async () => {
+        const store = new Vuex.Store({
+            modules: {
+                user: mockModule(userStore, { currentUser }),
+                history: mockModule(historyStore, {
+                    currentHistoryId: CURRENT_HISTORY_ID,
+                    currentHistory: { id: CURRENT_HISTORY_ID },
+                    histories: getFakeHistorySummaries(COUNT, 0).reduce((acc, curr, index) => {
+                        acc[curr.id] = curr;
+                        return acc;
+                    }, {}),
+                    historiesLoading: false,
+                    handlers: {},
+                }),
+            },
+        });
+
         wrapper = mount(MultipleView, {
             store,
             pinia,
diff --git a/client/src/components/History/Multiple/MultipleView.vue b/client/src/components/History/Multiple/MultipleView.vue
index fe2e07d6e77..8fc97c98f95 100644
--- a/client/src/components/History/Multiple/MultipleView.vue
+++ b/client/src/components/History/Multiple/MultipleView.vue
@@ -1,3 +1,24 @@
+<script setup lang="ts">
+import { ref } from "vue";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { faTimes } from "@fortawesome/free-solid-svg-icons";
+import LoadingSpan from "@/components/LoadingSpan.vue";
+import DebouncedInput from "@/components/DebouncedInput";
+import CurrentUser from "@/components/providers/CurrentUser";
+import UserHistories from "@/components/providers/UserHistories";
+import MultipleViewList from "./MultipleViewList.vue";
+
+const filter = ref("");
+
+//@ts-ignore bad library types
+library.add(faTimes);
+
+function updateFilter(newFilter: string) {
+    filter.value = newFilter;
+}
+</script>
+
 <template>
     <CurrentUser v-slot="{ user }">
         <UserHistories v-if="user" v-slot="{ histories, handlers, historiesLoading, currentHistory }" :user="user">
@@ -19,7 +40,7 @@
                         </DebouncedInput>
                         <b-input-group-append>
                             <b-button size="sm" data-description="show deleted filter toggle" @click="updateFilter('')">
-                                <icon icon="times" />
+                                <FontAwesomeIcon icon="fa-times" />
                             </b-button>
                         </b-input-group-append>
                     </b-input-group>
@@ -36,35 +57,3 @@
         </UserHistories>
     </CurrentUser>
 </template>
-
-<script>
-import LoadingSpan from "components/LoadingSpan";
-import DebouncedInput from "components/DebouncedInput";
-import CurrentUser from "components/providers/CurrentUser";
-import UserHistories from "components/providers/UserHistories";
-import MultipleViewList from "./MultipleViewList";
-import { library } from "@fortawesome/fontawesome-svg-core";
-import { faTimes } from "@fortawesome/free-solid-svg-icons";
-
-library.add(faTimes);
-
-export default {
-    components: {
-        LoadingSpan,
-        DebouncedInput,
-        CurrentUser,
-        UserHistories,
-        MultipleViewList,
-    },
-    data() {
-        return {
-            filter: "",
-        };
-    },
-    methods: {
-        updateFilter(filter) {
-            this.filter = filter;
-        },
-    },
-};
-</script>
diff --git a/client/src/components/History/Multiple/MultipleViewList.vue b/client/src/components/History/Multiple/MultipleViewList.vue
index 3f02a4d5dd4..481d2f3addc 100644
--- a/client/src/components/History/Multiple/MultipleViewList.vue
+++ b/client/src/components/History/Multiple/MultipleViewList.vue
@@ -1,3 +1,63 @@
+<script setup lang="ts">
+import { computed, ref, type Ref } from "vue";
+//@ts-ignore missing typedefs
+import VirtualList from "vue-virtual-scroll-list";
+import MultipleViewItem from "./MultipleViewItem.vue";
+import { useHistoryStore } from "@/stores/historyStore";
+import SelectorModal from "@/components/History/Modals/SelectorModal.vue";
+import { useAnimationFrameScroll } from "@/composables/sensors/animationFrameScroll";
+import { useAnimationFrameResizeObserver } from "@/composables/sensors/animationFrameResizeObserver";
+
+const historyStore = useHistoryStore();
+
+interface History {
+    id: string;
+}
+
+const props = withDefaults(
+    defineProps<{
+        histories: History[];
+        currentHistory: History;
+        // todo: stricter typedef for handlers, when MultipleViewItem is refactored
+        handlers: { [handler: string]: Function };
+        filter?: string;
+    }>(),
+    {
+        filter: "",
+    }
+);
+
+const scrollContainer: Ref<HTMLElement | null> = ref(null);
+const { arrived } = useAnimationFrameScroll(scrollContainer);
+
+const isScrollable = ref(false);
+useAnimationFrameResizeObserver(scrollContainer, ({ clientSize, scrollSize }) => {
+    isScrollable.value = scrollSize.width >= clientSize.width + 1;
+});
+
+const scrolledLeft = computed(() => !isScrollable.value || arrived.left);
+const scrolledRight = computed(() => !isScrollable.value || arrived.right);
+
+const selectedHistories: Ref<History[]> = computed(() => historyStore.pinnedHistories);
+
+function removeHistoryFromList(history: History) {
+    historyStore.unpinHistory(history.id);
+}
+
+if (!selectedHistories.value.length) {
+    historyStore.pinHistory(props.histories[0].id);
+}
+
+function addHistoriesToList(histories: History[]) {
+    histories.forEach((history) => {
+        const historyExists = selectedHistories.value.find((h) => h.id === history.id);
+        if (!historyExists) {
+            historyStore.pinHistory(history.id);
+        }
+    });
+}
+</script>
+
 <template>
     <div class="list-container h-100" :class="{ 'scrolled-left': scrolledLeft, 'scrolled-right': scrolledRight }">
         <div ref="scrollContainer" class="d-flex h-100 w-auto overflow-auto">
@@ -32,91 +92,6 @@
     </div>
 </template>
 
-<script>
-import { mapActions, mapState } from "pinia";
-import VirtualList from "vue-virtual-scroll-list";
-import MultipleViewItem from "./MultipleViewItem";
-import { useHistoryStore } from "stores/historyStore";
-import SelectorModal from "components/History/Modals/SelectorModal";
-import { useAnimationFrameScroll } from "composables/sensors/animationFrameScroll";
-import { useAnimationFrameResizeObserver } from "composables/sensors/animationFrameResizeObserver";
-import { computed, ref } from "vue";
-
-export default {
-    components: {
-        VirtualList,
-        SelectorModal,
-    },
-    props: {
-        histories: {
-            type: Array,
-            required: true,
-        },
-        currentHistory: {
-            type: Object,
-            required: true,
-        },
-        handlers: {
-            type: Object,
-            required: true,
-        },
-        filter: {
-            type: String,
-            default: "",
-        },
-    },
-    setup() {
-        const scrollContainer = ref(null);
-        const isScrollable = ref(false);
-        const { arrived } = useAnimationFrameScroll(scrollContainer);
-
-        useAnimationFrameResizeObserver(scrollContainer, () => {
-            isScrollable.value = scrollContainer.value.scrollWidth >= scrollContainer.value.clientWidth;
-        });
-
-        const scrolledLeft = computed(() => !isScrollable.value || arrived.left);
-        const scrolledRight = computed(() => !isScrollable.value || arrived.right);
-
-        return {
-            scrollContainer,
-            scrolledLeft,
-            scrolledRight,
-        };
-    },
-    data() {
-        return {
-            MultipleViewItem,
-        };
-    },
-    computed: {
-        ...mapState(useHistoryStore, ["pinnedHistories"]),
-        selectedHistories() {
-            return this.pinnedHistories;
-        },
-    },
-    created() {
-        if (!this.selectedHistories.length) {
-            const firstHistory = this.histories[0];
-            this.pinHistory(firstHistory.id);
-        }
-    },
-    methods: {
-        ...mapActions(useHistoryStore, ["pinHistory", "unpinHistory"]),
-        addHistoriesToList(histories) {
-            histories.forEach((history) => {
-                const historyExists = this.selectedHistories.find((h) => h.id == history.id);
-                if (!historyExists) {
-                    this.pinHistory(history.id);
-                }
-            });
-        },
-        removeHistoryFromList(history) {
-            this.unpinHistory(history.id);
-        },
-    },
-};
-</script>
-
 <style lang="scss" scoped>
 .list-container {
     .history-picker {
diff --git a/client/src/components/History/adapters/HistoryPanelProxy.js b/client/src/components/History/adapters/HistoryPanelProxy.js
index b5946fef8f2..8707e217487 100644
--- a/client/src/components/History/adapters/HistoryPanelProxy.js
+++ b/client/src/components/History/adapters/HistoryPanelProxy.js
@@ -4,6 +4,7 @@
  */
 import Backbone from "backbone";
 import store from "store";
+import { useHistoryItemsStore } from "stores/history/historyItemsStore";
 import { buildCollectionModal } from "./buildCollectionModal";
 import { createDatasetCollection } from "components/History/model/queries";
 import { watchHistory } from "store/historyStore/model/watchHistory";
@@ -12,30 +13,14 @@ import { watchHistory } from "store/historyStore/model/watchHistory";
 export class HistoryPanelProxy {
     constructor() {
         const model = (this.model = new Backbone.Model({}));
+        const historyItemsStore = useHistoryItemsStore();
         this.collection = {
             each(callback, filterText = "") {
-                const historyItems = store.getters.getHistoryItems({ historyId: model.id, filterText: filterText });
+                const historyItems = historyItemsStore.getHistoryItems(model.id, filterText);
                 historyItems.forEach((model) => {
                     callback(new Backbone.Model(model));
                 });
             },
-            on(name, callback) {
-                this.off();
-                this.unwatch = store.watch(
-                    (state, getters) => getters.getLatestCreateTime(),
-                    () => {
-                        callback();
-                        console.debug("History change watcher detected a change.", name);
-                    }
-                );
-                console.debug("History change watcher enabled.", name);
-            },
-            off(name) {
-                if (this.unwatch) {
-                    this.unwatch();
-                    console.debug("History change watcher disabled.", name);
-                }
-            },
         };
 
         // watch the store, update history id
diff --git a/client/src/components/History/model/queries.js b/client/src/components/History/model/queries.js
index 15c23121ba0..374ba2e6ab3 100644
--- a/client/src/components/History/model/queries.js
+++ b/client/src/components/History/model/queries.js
@@ -87,7 +87,6 @@ export async function bulkUpdate(history, operation, filters, items = [], params
         params,
     };
     const response = await axios.put(prependPath(url), payload);
-    console.debug(`Submitted request to ${operation} selected content in bulk. Parameters: ${params}`, response);
     return doResponse(response);
 }
 
diff --git a/client/src/components/History/services.js b/client/src/components/History/services.js
index ba2b93253fa..94b3af04edc 100644
--- a/client/src/components/History/services.js
+++ b/client/src/components/History/services.js
@@ -1,10 +1,9 @@
 import axios from "axios";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 import { rethrowSimple } from "utils/simple-error";
-import { getQueryString } from "utils/filterConversion";
 
-export async function getPublishedHistories({ limit, offset, sortBy, sortDesc, filterText }) {
-    const queryString = getQueryString(filterText, false);
+export async function getPublishedHistories({ limit, offset, sortBy, sortDesc, filterText }, filters) {
+    const queryString = filters.getQueryString(filterText);
     let params = `view=summary&keys=username,username_and_slug&offset=${offset}&limit=${limit}`;
     if (sortBy) {
         const sortPrefix = sortDesc ? "-dsc" : "-asc";
@@ -12,7 +11,7 @@ export async function getPublishedHistories({ limit, offset, sortBy, sortDesc, f
     }
     const url = `/api/histories/published?${params}&${queryString}`;
     try {
-        const { data } = await axios.get(safePath(url));
+        const { data } = await axios.get(withPrefix(url));
         return data;
     } catch (e) {
         rethrowSimple(e);
@@ -22,7 +21,7 @@ export async function getPublishedHistories({ limit, offset, sortBy, sortDesc, f
 export async function updateTags(itemId, itemClass, itemTags) {
     const url = "/api/tags";
     try {
-        const { data } = await axios.put(safePath(url), {
+        const { data } = await axios.put(withPrefix(url), {
             item_id: itemId,
             item_class: itemClass,
             item_tags: itemTags,
diff --git a/client/src/components/HistoryExport/Index.test.js b/client/src/components/HistoryExport/Index.test.js
index 830104b2491..ffe88553974 100644
--- a/client/src/components/HistoryExport/Index.test.js
+++ b/client/src/components/HistoryExport/Index.test.js
@@ -1,6 +1,6 @@
 import { shallowMount } from "@vue/test-utils";
 import Index from "./Index.vue";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 
diff --git a/client/src/components/HistoryExport/ToLink.test.js b/client/src/components/HistoryExport/ToLink.test.js
index 39b3defb70f..a87ce263e2c 100644
--- a/client/src/components/HistoryExport/ToLink.test.js
+++ b/client/src/components/HistoryExport/ToLink.test.js
@@ -1,5 +1,5 @@
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import ToLink from "./ToLink.vue";
 import flushPromises from "flush-promises";
 import MockAdapter from "axios-mock-adapter";
diff --git a/client/src/components/HistoryExport/ToRemoteFile.test.js b/client/src/components/HistoryExport/ToRemoteFile.test.js
index 111604ae09f..f19aa535d32 100644
--- a/client/src/components/HistoryExport/ToRemoteFile.test.js
+++ b/client/src/components/HistoryExport/ToRemoteFile.test.js
@@ -1,5 +1,5 @@
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import ToRemoteFile from "./ToRemoteFile.vue";
 import MockAdapter from "axios-mock-adapter";
 import axios from "axios";
diff --git a/client/src/components/HistoryImport.test.js b/client/src/components/HistoryImport.test.js
index 2e304a50588..b53c4c1b184 100644
--- a/client/src/components/HistoryImport.test.js
+++ b/client/src/components/HistoryImport.test.js
@@ -1,5 +1,5 @@
-import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { mount } from "@vue/test-utils";
+import { getLocalVue, wait } from "tests/jest/helpers";
 import HistoryImport from "./HistoryImport.vue";
 import MockAdapter from "axios-mock-adapter";
 import axios from "axios";
@@ -21,7 +21,7 @@ describe("HistoryImport.vue", () => {
     beforeEach(async () => {
         axiosMock = new MockAdapter(axios);
         axiosMock.onGet(TEST_PLUGINS_URL).reply(200, [{ id: "foo", writable: false }]);
-        wrapper = shallowMount(HistoryImport, {
+        wrapper = mount(HistoryImport, {
             propsData: {},
             localVue,
         });
@@ -76,6 +76,23 @@ describe("HistoryImport.vue", () => {
         expect(wrapper.vm.complete).toBeTruthy();
     });
 
+    it("warns about shared history imports", async () => {
+        const input = wrapper.find("input[type=url]");
+        await input.setValue("https://usegalaxy.org/u/some_user/h/exported_history");
+
+        await wait(210);
+
+        const alert = wrapper.find(".alert");
+        expect(alert.classes()).toContain("alert-warning");
+        expect(alert.text()).toContain(
+            "It looks like you are trying to import a published history from another galaxy instance"
+        );
+
+        // Link to the GTN
+        const link = alert.find("a");
+        expect(link.text()).toContain("GTN");
+    });
+
     afterEach(() => {
         axiosMock.restore();
     });
diff --git a/client/src/components/HistoryImport.vue b/client/src/components/HistoryImport.vue
index 7ab8df2f8cd..7149f9aa5e2 100644
--- a/client/src/components/HistoryImport.vue
+++ b/client/src/components/HistoryImport.vue
@@ -1,8 +1,7 @@
 <template>
-    <b-card body-class="history-import-component" aria-labelledby="history-import-heading">
-        <template slot="header">
-            <h1 id="history-import-heading" class="mb-0 h-sm">Import a history from an archive</h1>
-        </template>
+    <div class="history-import-component" aria-labelledby="history-import-heading">
+        <h1 id="history-import-heading" class="h-lg">Import a history from an archive</h1>
+
         <b-alert v-if="errorMessage" variant="danger" dismissible show @dismissed="errorMessage = null">
             {{ errorMessage }}
             <JobError
@@ -11,6 +10,7 @@
                 header="History import job ended in error"
                 :job="jobError" />
         </b-alert>
+
         <div v-if="initializing">
             <loading-span message="Loading server configuration." />
         </div>
@@ -45,23 +45,35 @@
                         </b-form-radio>
                     </b-form-radio-group>
                 </b-form-group>
-                <b-form-group v-if="importType == 'externalUrl'" label="Archived History URL">
+
+                <b-form-group v-if="importType === 'externalUrl'" label="Archived History URL">
+                    <b-alert v-if="showImportUrlWarning" variant="warning" show>
+                        It looks like you are trying to import a published history from another galaxy instance. You can
+                        only import histories via an archive URL.
+                        <ExternalLink
+                            href="https://training.galaxyproject.org/training-material/faqs/galaxy/histories_transfer_entire_histories_from_one_galaxy_server_to_another.html">
+                            Read more on the GTN
+                        </ExternalLink>
+                    </b-alert>
+
                     <b-form-input v-model="sourceURL" type="url" />
                 </b-form-group>
-                <b-form-group v-if="importType == 'upload'" label="Archived History File">
+                <b-form-group v-else-if="importType === 'upload'" label="Archived History File">
                     <b-form-file v-model="sourceFile" />
                 </b-form-group>
-                <b-form-group v-show="importType == 'remoteFilesUri'" label="Remote File">
+                <b-form-group v-show="importType === 'remoteFilesUri'" label="Remote File">
                     <!-- using v-show so we can have a persistent ref and launch dialog on select -->
                     <files-input ref="filesInput" v-model="sourceRemoteFilesUri" />
                 </b-form-group>
-                <b-button class="import-button" variant="primary" type="submit" :disabled="!importReady"
-                    >Import history</b-button
-                >
+
+                <b-button class="import-button" variant="primary" type="submit" :disabled="!importReady">
+                    Import history
+                </b-button>
             </b-form>
         </div>
-    </b-card>
+    </div>
 </template>
+
 <script>
 import { getAppRoot } from "onload/loadConfig";
 import axios from "axios";
@@ -76,6 +88,9 @@ import { errorMessageAsString } from "utils/simple-error";
 import LoadingSpan from "components/LoadingSpan";
 import JobError from "components/JobInformation/JobError";
 import { Services } from "components/FilesDialog/services";
+import { ref, watch } from "vue";
+import { refDebounced } from "@vueuse/core";
+import ExternalLink from "./ExternalLink";
 
 library.add(faFolderOpen);
 library.add(faUpload);
@@ -83,13 +98,32 @@ library.add(faExternalLinkAlt);
 Vue.use(BootstrapVue);
 
 export default {
-    components: { FilesInput, FontAwesomeIcon, JobError, LoadingSpan },
+    components: { FilesInput, FontAwesomeIcon, JobError, LoadingSpan, ExternalLink },
+    setup() {
+        const sourceURL = ref("");
+        const debouncedURL = refDebounced(sourceURL, 200);
+        const mayBeHistoryUrlRegEx = /\/u(ser)?\/.+\/h(istory)?\/.+/;
+
+        const showImportUrlWarning = ref(false);
+
+        watch(
+            () => debouncedURL.value,
+            (val) => {
+                const url = val ?? "";
+                showImportUrlWarning.value = Boolean(url.match(mayBeHistoryUrlRegEx));
+            }
+        );
+
+        return {
+            sourceURL,
+            showImportUrlWarning,
+        };
+    },
     data() {
         return {
             initializing: true,
             importType: "externalUrl",
             sourceFile: null,
-            sourceURL: null,
             sourceRemoteFilesUri: null,
             errorMessage: null,
             waitingOnJob: false,
diff --git a/client/src/components/Indices/SharingIndicators.test.js b/client/src/components/Indices/SharingIndicators.test.js
index bc19d7c1af9..b5a257e4a95 100644
--- a/client/src/components/Indices/SharingIndicators.test.js
+++ b/client/src/components/Indices/SharingIndicators.test.js
@@ -1,6 +1,6 @@
 import SharingIndicators from "./SharingIndicators";
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 
 const localVue = getLocalVue();
 
diff --git a/client/src/components/Indices/filtersMixin.test.js b/client/src/components/Indices/filtersMixin.test.js
index f0ae0f650ba..32d692b1c24 100644
--- a/client/src/components/Indices/filtersMixin.test.js
+++ b/client/src/components/Indices/filtersMixin.test.js
@@ -1,5 +1,5 @@
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import filtersMixin from "./filtersMixin";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/InteractiveTools/InteractiveTools.test.js b/client/src/components/InteractiveTools/InteractiveTools.test.js
index 0fa88bb0d0b..850a858b6a8 100644
--- a/client/src/components/InteractiveTools/InteractiveTools.test.js
+++ b/client/src/components/InteractiveTools/InteractiveTools.test.js
@@ -1,45 +1,48 @@
+import { createTestingPinia } from "@pinia/testing";
+import { setActivePinia, PiniaVuePlugin } from "pinia";
 import InteractiveTools from "./InteractiveTools";
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
-import flushPromises from "flush-promises";
+import { getLocalVue } from "tests/jest/helpers";
 import testInteractiveToolsResponse from "./testData/testInteractiveToolsResponse";
+import { useEntryPointStore } from "stores/entryPointStore";
 
+import flushPromises from "flush-promises";
 import MockAdapter from "axios-mock-adapter";
 import axios from "axios";
 
 describe("InteractiveTools/InteractiveTools.vue", () => {
     const localVue = getLocalVue();
+    localVue.use(PiniaVuePlugin);
     let wrapper;
+    let testPinia;
     let axiosMock;
 
     beforeEach(async () => {
-        axiosMock = new MockAdapter(axios);
-        axiosMock.onGet("/api/entry_points?running=true").reply(200, testInteractiveToolsResponse);
-        axiosMock.onDelete(new RegExp("/api/entry_points/*")).reply(200, { status: "ok", message: "ok" });
-        wrapper = mount(InteractiveTools, {
-            computed: {
-                currentHistory() {
-                    return {
-                        loadCurrentHistory() {},
-                    };
+        testPinia = createTestingPinia({
+            initialState: {
+                entryPointStore: {
+                    entryPoints: testInteractiveToolsResponse,
                 },
             },
-            localVue,
         });
-
-        await flushPromises();
+        setActivePinia(testPinia);
+        wrapper = mount(InteractiveTools, {
+            localVue,
+            pinia: testPinia,
+        });
+        axiosMock = new MockAdapter(axios);
     });
 
     afterEach(() => {
         axiosMock.restore();
     });
 
-    it("Interactive Tool Table renders", async () => {
-        const table = wrapper.find("#interactive-tool-table");
-        expect(table.exists() === true).toBeTruthy();
+    it("renders table with interactive tools", async () => {
+        expect(wrapper.get("#interactive-tool-table").exists() === true).toBeTruthy();
+        expect(wrapper.findAll("td > a").length).toBe(2);
     });
 
-    it("Interactive Tool should disappear after stop button pressed", async () => {
+    it("removes the interactive tool when it is gone from store", async () => {
         function checkIfExists(tag, toolId) {
             return wrapper.find(tag + toolId).exists();
         }
@@ -47,18 +50,33 @@ describe("InteractiveTools/InteractiveTools.vue", () => {
         const tool = wrapper.vm.activeInteractiveTools.find((tool) => tool.id === toolId);
         expect(checkIfExists("#link-", toolId) === true).toBeTruthy();
         expect(tool.marked === undefined || false).toBeTruthy();
-
-        const checkbox = wrapper.find("#checkbox-" + toolId);
-        checkbox.setChecked();
-        await flushPromises();
+        const checkbox = wrapper.get("#checkbox-" + toolId);
+        await checkbox.setChecked();
         expect(tool.marked === true).toBeTruthy();
 
-        const stopBtn = wrapper.find("#stopInteractiveTool");
-        stopBtn.trigger("click");
-        await flushPromises();
+        // drop the tested tool from store
+        const store = useEntryPointStore();
+        await store.entryPoints.splice(0, 1);
 
-        const toolExists = wrapper.vm.activeInteractiveTools.includes((tool) => tool.id === toolId);
-        expect(toolExists === false).toBeTruthy();
+        const deletedTool = wrapper.vm.activeInteractiveTools.filter((tool) => tool.id === toolId);
+        expect(deletedTool.length).toBe(0);
         expect(checkIfExists("#link-", toolId) === false).toBeTruthy();
     });
+
+    it("sends a delete request after the stop button is pressed", async () => {
+        axiosMock = new MockAdapter(axios);
+        axiosMock.onDelete(new RegExp("/api/entry_points/*")).reply(200, { status: "ok", message: "ok" });
+        await wrapper.get("#checkbox-" + testInteractiveToolsResponse[0].id).setChecked();
+        await wrapper.get("#stopInteractiveTool").trigger("click");
+        expect(axiosMock.history.delete.length).toBe(1);
+        expect(axiosMock.history.delete[0].url === "/api/entry_points/b887d74393f85b6d").toBeTruthy();
+    });
+
+    it("shows an error message if the tool deletion fails", async () => {
+        axiosMock = new MockAdapter(axios);
+        axiosMock.onDelete(new RegExp("/api/entry_points/*")).networkError();
+        wrapper.get("#stopInteractiveTool").trigger("click");
+        await flushPromises();
+        expect(wrapper.get(".alert-danger").text()).toMatch(/Network Error/);
+    });
 });
diff --git a/client/src/components/InteractiveTools/InteractiveTools.vue b/client/src/components/InteractiveTools/InteractiveTools.vue
index 36979e66c86..4fe415e0e46 100644
--- a/client/src/components/InteractiveTools/InteractiveTools.vue
+++ b/client/src/components/InteractiveTools/InteractiveTools.vue
@@ -27,12 +27,15 @@
             <template v-slot:cell(name)="row">
                 <a
                     :id="createId('link', row.item.id)"
+                    v-b-tooltip
+                    title="Open Interactive Tool"
                     :index="row.index"
                     :href="row.item.target"
                     target="_blank"
                     :name="row.item.name"
-                    >{{ row.item.name }}</a
-                >
+                    >{{ row.item.name }}
+                    <font-awesome-icon icon="external-link-alt" />
+                </a>
             </template>
             <template v-slot:cell(job_info)="row">
                 <label v-if="row.item.active"> running </label>
@@ -65,10 +68,18 @@
 import { getAppRoot } from "onload/loadConfig";
 import { Services } from "./services";
 import UtcDate from "components/UtcDate";
+import { mapActions, mapState } from "pinia";
+import { useEntryPointStore } from "../../stores/entryPointStore";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons";
+
+library.add(faExternalLinkAlt);
 
 export default {
     components: {
         UtcDate,
+        FontAwesomeIcon,
     },
     data() {
         return {
@@ -102,10 +113,10 @@ export default {
             filter: "",
             messages: [],
             nInteractiveTools: 0,
-            activeInteractiveTools: [],
         };
     },
     computed: {
+        ...mapState(useEntryPointStore, { activeInteractiveTools: "entryPoints" }),
         showNotFound() {
             return this.nInteractiveTools === 0 && this.filter && !this.isActiveToolsListEmpty;
         },
@@ -122,16 +133,10 @@ export default {
         this.load();
     },
     methods: {
+        ...mapActions(useEntryPointStore, ["ensurePollingEntryPoints", "removeEntryPoint"]),
         load() {
+            this.ensurePollingEntryPoints();
             this.filter = "";
-            this.services
-                .getActiveInteractiveTools()
-                .then((activeInteractiveTools) => {
-                    this.activeInteractiveTools = activeInteractiveTools;
-                })
-                .catch((error) => {
-                    this.error = error;
-                });
         },
         filtered: function (items) {
             this.nInteractiveTools = items.length;
@@ -143,7 +148,7 @@ export default {
                     this.services
                         .stopInteractiveTool(tool.id)
                         .then((response) => {
-                            this.activeInteractiveTools = this.activeInteractiveTools.filter((tool) => !tool.marked);
+                            this.removeEntryPoint(tool.id);
                         })
                         .catch((error) => {
                             this.messages.push(`Failed to stop interactive tool ${tool.name}: ${error.message}`);
diff --git a/client/src/components/InteractiveTools/services.js b/client/src/components/InteractiveTools/services.js
index 76217d07bc7..7f101fdbb6e 100644
--- a/client/src/components/InteractiveTools/services.js
+++ b/client/src/components/InteractiveTools/services.js
@@ -7,16 +7,6 @@ export class Services {
         this.root = options.root || getAppRoot();
     }
 
-    async getActiveInteractiveTools() {
-        const url = `${this.root}api/entry_points?running=true`;
-        try {
-            const response = await axios.get(url);
-            return response.data;
-        } catch (e) {
-            rethrowSimple(e);
-        }
-    }
-
     async stopInteractiveTool(id) {
         const url = `${this.root}api/entry_points/${id}`;
         const response = await axios.delete(url);
diff --git a/client/src/components/InteractiveTools/testData/testInteractiveToolsResponse.json b/client/src/components/InteractiveTools/testData/testInteractiveToolsResponse.json
index 8fbfcaf225d..a519342284f 100644
--- a/client/src/components/InteractiveTools/testData/testInteractiveToolsResponse.json
+++ b/client/src/components/InteractiveTools/testData/testInteractiveToolsResponse.json
@@ -2,19 +2,27 @@
   {
     "model_class": "InteractiveToolEntryPoint",
     "id": "52e496b945151ee8",
+    "job_id": "6fc9fbb81c497f69",
     "name": "Jupyter Interactive Tool",
     "active": true,
     "created_time": "2020-02-24T15:59:18.122103",
     "modified_time": "2020-02-24T15:59:20.428594",
+    "output_datasets_ids": [
+      "4e9e0c7225b0bb81"
+    ],
     "target": "http://52e496b945151ee8-be8a5bee5d5849a5b4e035b51305256e.interactivetoolentrypoint.interactivetool.localhost:8080/ipython/lab"
   },
   {
     "model_class": "InteractiveToolEntryPoint",
     "id": "b887d74393f85b6d",
+    "job_id": "201592c8e20dac24",
     "name": "AskOmics instance on None",
     "active": true,
     "created_time": "2020-01-24T15:59:22.406480",
     "modified_time": "2020-02-24T15:59:24.757453",
+    "output_datasets_ids": [
+      "ac59b4df0950f761"
+    ],
     "target": "http://b887d74393f85b6d-b1fd3f42331a49c1b3d8a4d1b27240b8.interactivetoolentrypoint.interactivetool.localhost:8080/loginapikey/oleg"
   }
-]
\ No newline at end of file
+]
diff --git a/client/src/components/JobInformation/JobInformation.test.js b/client/src/components/JobInformation/JobInformation.test.js
index 4881f5d93ec..b076f3e8000 100644
--- a/client/src/components/JobInformation/JobInformation.test.js
+++ b/client/src/components/JobInformation/JobInformation.test.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import JobInformation from "./JobInformation";
 import jobResponse from "./testData/jobInformationResponse.json";
 
diff --git a/client/src/components/Libraries/LibraryFolder/FolderDetails/FolderDetails.test.js b/client/src/components/Libraries/LibraryFolder/FolderDetails/FolderDetails.test.js
index a9b1d8c2bde..284e53d5e21 100644
--- a/client/src/components/Libraries/LibraryFolder/FolderDetails/FolderDetails.test.js
+++ b/client/src/components/Libraries/LibraryFolder/FolderDetails/FolderDetails.test.js
@@ -2,7 +2,7 @@ import { mount } from "@vue/test-utils";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import flushPromises from "flush-promises";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import FolderDetails from "./FolderDetails";
 import apiResponse from "./response.test.json";
 
diff --git a/client/src/components/Libraries/LibraryFolder/LibraryFolderDataset/LibraryDataset.test.js b/client/src/components/Libraries/LibraryFolder/LibraryFolderDataset/LibraryDataset.test.js
index ba68df822d6..ebe0b8a281d 100644
--- a/client/src/components/Libraries/LibraryFolder/LibraryFolderDataset/LibraryDataset.test.js
+++ b/client/src/components/Libraries/LibraryFolder/LibraryFolderDataset/LibraryDataset.test.js
@@ -1,6 +1,6 @@
 import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import { getAppRoot } from "onload/loadConfig";
 import { Services } from "../services";
 import LibraryDataset from "./LibraryDataset";
diff --git a/client/src/components/Login/ChangePassword.test.js b/client/src/components/Login/ChangePassword.test.js
index a56606be4bb..443b217a956 100644
--- a/client/src/components/Login/ChangePassword.test.js
+++ b/client/src/components/Login/ChangePassword.test.js
@@ -1,14 +1,14 @@
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
-import { safePath } from "utils/redirect";
+import { getLocalVue } from "tests/jest/helpers";
+import { withPrefix } from "utils/redirect";
 import MountTarget from "./ChangePassword";
 
 // mock routes
 jest.mock("utils/redirect");
 const mockSafePath = jest.fn();
-safePath.mockImplementation(() => mockSafePath);
+withPrefix.mockImplementation(() => mockSafePath);
 
 const localVue = getLocalVue(true);
 
diff --git a/client/src/components/Login/ChangePassword.vue b/client/src/components/Login/ChangePassword.vue
index cec0434b678..58ad8095e4b 100644
--- a/client/src/components/Login/ChangePassword.vue
+++ b/client/src/components/Login/ChangePassword.vue
@@ -17,7 +17,7 @@
 import axios from "axios";
 import Vue from "vue";
 import BootstrapVue from "bootstrap-vue";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 
 Vue.use(BootstrapVue);
 
@@ -52,7 +52,7 @@ export default {
     methods: {
         submit() {
             axios
-                .post(safePath("/user/change_password"), {
+                .post(withPrefix("/user/change_password"), {
                     token: this.token,
                     id: this.expiredUser,
                     current: this.current,
@@ -60,7 +60,7 @@ export default {
                     confirm: this.confirm,
                 })
                 .then((response) => {
-                    window.location = safePath(`/`);
+                    window.location = withPrefix(`/`);
                 })
                 .catch((error) => {
                     this.variant = "danger";
diff --git a/client/src/components/Login/LoginForm.test.js b/client/src/components/Login/LoginForm.test.js
index 1aa2630c0e5..07529701f92 100644
--- a/client/src/components/Login/LoginForm.test.js
+++ b/client/src/components/Login/LoginForm.test.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import MountTarget from "./LoginForm";
 
 const localVue = getLocalVue(true);
@@ -55,7 +55,7 @@ describe("LoginForm", () => {
             welcomeUrl: "welcome_url",
         });
         const register = wrapper.find($register);
-        expect(register.text()).toBe("Register here.");
+        expect(register.text()).toBeLocalizationOf("Register here.");
         const welcomePage = wrapper.find("iframe");
         expect(welcomePage.attributes("src")).toBe("welcome_url");
     });
diff --git a/client/src/components/Login/LoginForm.vue b/client/src/components/Login/LoginForm.vue
index 1607506ab6c..24dba3c8bf2 100644
--- a/client/src/components/Login/LoginForm.vue
+++ b/client/src/components/Login/LoginForm.vue
@@ -7,23 +7,27 @@
                         {{ messageText }}
                     </b-alert>
                     <b-form id="login" @submit.prevent="submitLogin()">
-                        <b-card no-body header="Welcome to Galaxy, please log in">
+                        <b-card no-body :header="headerWelcome">
                             <b-card-body>
                                 <div>
                                     <!-- standard internal galaxy login -->
-                                    <b-form-group label="Public Name or Email Address">
+                                    <b-form-group :label="labelNameAddress">
                                         <b-form-input v-model="login" name="login" type="text" />
                                     </b-form-group>
-                                    <b-form-group label="Password">
+                                    <b-form-group :label="labelPassword">
                                         <b-form-input v-model="password" name="password" type="password" />
-                                        <b-form-text>
+                                        <b-form-text v-localize>
                                             Forgot password?
-                                            <a href="javascript:void(0)" role="button" @click.prevent="resetLogin">
+                                            <a
+                                                v-localize
+                                                href="javascript:void(0)"
+                                                role="button"
+                                                @click.prevent="resetLogin">
                                                 Click here to reset your password.
                                             </a>
                                         </b-form-text>
                                     </b-form-group>
-                                    <b-button name="login" type="submit">Login</b-button>
+                                    <b-button v-localize name="login" type="submit">Login</b-button>
                                 </div>
                                 <div v-if="enableOidc">
                                     <!-- OIDC login-->
@@ -35,6 +39,7 @@
                                 <span v-if="allowUserCreation">
                                     <a
                                         id="register-toggle"
+                                        v-localize
                                         href="javascript:void(0)"
                                         role="button"
                                         @click.prevent="toggleLogin">
@@ -78,9 +83,10 @@
 import axios from "axios";
 import Vue from "vue";
 import BootstrapVue from "bootstrap-vue";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 import NewUserConfirmation from "./NewUserConfirmation";
 import ExternalLogin from "components/User/ExternalIdentities/ExternalLogin";
+import _l from "utils/localization";
 
 Vue.use(BootstrapVue);
 
@@ -130,6 +136,9 @@ export default {
             url: null,
             messageText: null,
             messageVariant: null,
+            headerWelcome: _l("Welcome to Galaxy, please log in"),
+            labelNameAddress: _l("Public Name or Email Address"),
+            labelPassword: _l("Password"),
         };
     },
     computed: {
@@ -138,7 +147,7 @@ export default {
             return urlParams.has("confirm") && urlParams.get("confirm") == "true";
         },
         welcomeUrlWithRoot() {
-            return safePath(this.welcomeUrl);
+            return withPrefix(this.welcomeUrl);
         },
     },
     methods: {
@@ -151,7 +160,7 @@ export default {
                 redirect = localStorage.getItem("redirect_url");
             }
             axios
-                .post(safePath("/user/login"), {
+                .post(withPrefix("/user/login"), {
                     login: this.login,
                     password: this.password,
                     redirect: redirect,
@@ -162,11 +171,11 @@ export default {
                         alert(data.message);
                     }
                     if (data.expired_user) {
-                        window.location = safePath(`/root/login?expired_user=${data.expired_user}`);
+                        window.location = withPrefix(`/root/login?expired_user=${data.expired_user}`);
                     } else if (data.redirect) {
                         window.location = encodeURI(data.redirect);
                     } else {
-                        window.location = safePath("/");
+                        window.location = withPrefix("/");
                     }
                 })
                 .catch((error) => {
@@ -180,7 +189,7 @@ export default {
         },
         resetLogin() {
             axios
-                .post(safePath("/user/reset_password"), { email: this.login })
+                .post(withPrefix("/user/reset_password"), { email: this.login })
                 .then((response) => {
                     this.messageVariant = "info";
                     this.messageText = response.data.message;
diff --git a/client/src/components/Login/LoginIndex.test.js b/client/src/components/Login/LoginIndex.test.js
index b8927d59ec8..4a4bb9e3918 100644
--- a/client/src/components/Login/LoginIndex.test.js
+++ b/client/src/components/Login/LoginIndex.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import MountTarget from "./LoginIndex";
 
 const localVue = getLocalVue(true);
@@ -28,7 +28,7 @@ describe("LoginIndex", () => {
         expect(registerToggle.exists()).toBeTruthy();
         await registerToggle.trigger("click");
         const newCardHeader = wrapper.find(".card-header");
-        expect(newCardHeader.text()).toBe("Create a Galaxy account");
+        expect(newCardHeader.text()).toBeLocalizationOf("Create a Galaxy account");
         const $loginToggle = "[id=login-toggle]";
         const loginToggle = wrapper.find($loginToggle);
         await loginToggle.trigger("click");
diff --git a/client/src/components/Login/NewUserConfirmation.test.js b/client/src/components/Login/NewUserConfirmation.test.js
index b82770f63bc..ae93957c8bd 100644
--- a/client/src/components/Login/NewUserConfirmation.test.js
+++ b/client/src/components/Login/NewUserConfirmation.test.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import MountTarget from "./NewUserConfirmation";
 
 const localVue = getLocalVue(true);
diff --git a/client/src/components/Login/NewUserConfirmation.vue b/client/src/components/Login/NewUserConfirmation.vue
index e0aff1bcce5..32837b9a62c 100644
--- a/client/src/components/Login/NewUserConfirmation.vue
+++ b/client/src/components/Login/NewUserConfirmation.vue
@@ -60,7 +60,7 @@
 import axios from "axios";
 import Vue from "vue";
 import BootstrapVue from "bootstrap-vue";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 
 Vue.use(BootstrapVue);
 
@@ -84,25 +84,25 @@ export default {
     },
     computed: {
         termsUrlwithRoot() {
-            return safePath(this.termsUrl);
+            return withPrefix(this.termsUrl);
         },
     },
     methods: {
         login() {
             // set url to redirect user to 3rd party management after login
             this.$emit("setRedirect", "/user/external_ids");
-            window.location = safePath("/login");
+            window.location = withPrefix("/login");
         },
         submit() {
             const urlParams = new URLSearchParams(window.location.search);
             const token = urlParams.get("custos_token");
             axios
-                .post(safePath(`/authnz/custos/create_user?token=${token}`))
+                .post(withPrefix(`/authnz/custos/create_user?token=${token}`))
                 .then((response) => {
                     if (response.data.redirect_uri) {
                         window.location = response.data.redirect_uri;
                     } else {
-                        window.location = safePath("/");
+                        window.location = withPrefix("/");
                     }
                 })
                 .catch((error) => {
diff --git a/client/src/components/Login/RegisterForm.test.js b/client/src/components/Login/RegisterForm.test.js
index a2a2033b433..dbc33e763dc 100644
--- a/client/src/components/Login/RegisterForm.test.js
+++ b/client/src/components/Login/RegisterForm.test.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import MountTarget from "./RegisterForm";
 
 const localVue = getLocalVue(true);
@@ -26,7 +26,7 @@ describe("RegisterForm", () => {
 
     it("basics", async () => {
         const cardHeader = wrapper.find(".card-header");
-        expect(cardHeader.text()).toBe("Create a Galaxy account");
+        expect(cardHeader.text()).toBeLocalizationOf("Create a Galaxy account");
         const inputs = wrapper.findAll("input");
         expect(inputs.length).toBe(4);
         const usernameField = inputs.at(0);
diff --git a/client/src/components/Login/RegisterForm.vue b/client/src/components/Login/RegisterForm.vue
index cf737931031..1cac50f5cf0 100644
--- a/client/src/components/Login/RegisterForm.vue
+++ b/client/src/components/Login/RegisterForm.vue
@@ -24,8 +24,8 @@
                             </b-collapse>
                         </span>
                         <!-- Local Galaxy Registration -->
-                        <b-card-header v-if="!custosPreferred">Create a Galaxy account</b-card-header>
-                        <b-card-header v-else v-b-toggle.accordion-register role="button">
+                        <b-card-header v-if="!custosPreferred" v-localize>Create a Galaxy account</b-card-header>
+                        <b-card-header v-else v-localize v-b-toggle.accordion-register role="button">
                             Or, register with email
                         </b-card-header>
                         <b-collapse
@@ -34,35 +34,40 @@
                             role="tabpanel"
                             accordion="registration_acc">
                             <b-card-body>
-                                <b-form-group label="Email Address">
+                                <b-form-group :label="labelEmailAddress">
                                     <b-form-input v-model="email" name="email" type="text" />
                                 </b-form-group>
-                                <b-form-group label="Password">
+                                <b-form-group :label="labelPassword">
                                     <b-form-input v-model="password" name="password" type="password" />
                                 </b-form-group>
-                                <b-form-group label="Confirm password">
+                                <b-form-group :label="labelConfirmPassword">
                                     <b-form-input v-model="confirm" name="confirm" type="password" />
                                 </b-form-group>
-                                <b-form-group label="Public name">
+                                <b-form-group :label="labelPublicName">
                                     <b-form-input v-model="username" name="username" type="text" />
-                                    <b-form-text>
-                                        Your public name is an identifier that will be used to generate addresses for
+                                    <b-form-text v-localize
+                                        >Your public name is an identifier that will be used to generate addresses for
                                         information you share publicly. Public names must be at least three characters
                                         in length and contain only lower-case letters, numbers, dots, underscores, and
                                         dashes ('.', '_', '-').
                                     </b-form-text>
                                 </b-form-group>
-                                <b-form-group
-                                    v-if="mailingJoinAddr && serverMailConfigured"
-                                    label="Subscribe to mailing list">
+                                <b-form-group v-if="mailingJoinAddr && serverMailConfigured" :label="labelSubscribe">
                                     <input v-model="subscribe" name="subscribe" type="checkbox" />
                                 </b-form-group>
-                                <b-button name="create" type="submit" :disabled="disableCreate">Create</b-button>
+                                <b-button v-localize name="create" type="submit" :disabled="disableCreate"
+                                    >Create</b-button
+                                >
                             </b-card-body>
                         </b-collapse>
-                        <b-card-footer v-if="showLoginLink">
+                        <b-card-footer v-if="showLoginLink" v-localize>
                             Already have an account?
-                            <a id="login-toggle" href="javascript:void(0)" role="button" @click.prevent="toggleLogin">
+                            <a
+                                id="login-toggle"
+                                v-localize
+                                href="javascript:void(0)"
+                                role="button"
+                                @click.prevent="toggleLogin">
                                 Log in here.
                             </a>
                         </b-card-footer>
@@ -79,8 +84,9 @@
 import axios from "axios";
 import Vue from "vue";
 import BootstrapVue from "bootstrap-vue";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 import ExternalLogin from "components/User/ExternalIdentities/ExternalLogin";
+import _l from "utils/localization";
 
 Vue.use(BootstrapVue);
 
@@ -136,6 +142,11 @@ export default {
             subscribe: null,
             messageText: null,
             messageVariant: null,
+            labelEmailAddress: _l("Email address"),
+            labelPassword: _l("Password"),
+            labelConfirmPassword: _l("Confirm password"),
+            labelPublicName: _l("Public name"),
+            labelSubscribe: _l("Subscribe to mailing list"),
         };
     },
     computed: {
@@ -150,7 +161,7 @@ export default {
         submit() {
             this.disableCreate = true;
             axios
-                .post(safePath("/user/create"), {
+                .post(withPrefix("/user/create"), {
                     email: this.email,
                     username: this.username,
                     password: this.password,
@@ -162,7 +173,7 @@ export default {
                     if (response.data.message && response.data.status) {
                         alert(response.data.message);
                     }
-                    window.location = this.redirect || safePath("/welcome/new");
+                    window.location = this.redirect || withPrefix("/welcome/new");
                 })
                 .catch((error) => {
                     this.disableCreate = false;
diff --git a/client/src/components/Markdown/Elements/HistoryDatasetDisplay.test.js b/client/src/components/Markdown/Elements/HistoryDatasetDisplay.test.js
index 1f82bf90ac9..fa4eb1fbe08 100644
--- a/client/src/components/Markdown/Elements/HistoryDatasetDisplay.test.js
+++ b/client/src/components/Markdown/Elements/HistoryDatasetDisplay.test.js
@@ -1,6 +1,6 @@
 import axios from "axios";
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import MockAdapter from "axios-mock-adapter";
 import HistoryDatasetDisplay from "./HistoryDatasetDisplay.vue";
 import { typesAndMappingResponse } from "components/Datatypes/test_fixtures";
diff --git a/client/src/components/Markdown/Elements/HistoryLink.vue b/client/src/components/Markdown/Elements/HistoryLink.vue
index 6974fb7cea1..052f819ca6f 100644
--- a/client/src/components/Markdown/Elements/HistoryLink.vue
+++ b/client/src/components/Markdown/Elements/HistoryLink.vue
@@ -15,11 +15,11 @@
 
 <script>
 import axios from "axios";
-import { getAppRoot } from "onload/loadConfig";
 import Vue from "vue";
 import BootstrapVue from "bootstrap-vue";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { errorMessageAsString } from "utils/simple-error";
+import { withPrefix } from "utils/redirect";
 
 Vue.use(BootstrapVue);
 
@@ -54,7 +54,7 @@ export default {
     methods: {
         onClick() {
             axios
-                .post(`${getAppRoot()}api/histories`, { history_id: this.args.history_id })
+                .post(withPrefix("/api/histories"), { history_id: this.args.history_id })
                 .then(() => {
                     this.imported = true;
                 })
diff --git a/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.test.js b/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.test.js
index 0dfcd7e506f..2cf1191a887 100644
--- a/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.test.js
+++ b/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.test.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import MountTarget from "./WorkflowDisplay";
 
 const localVue = getLocalVue(true);
diff --git a/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.vue b/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.vue
index 154a6ff7171..2bcdcb80446 100644
--- a/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.vue
+++ b/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script>
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 import { urlData } from "utils/url";
 import LoadingSpan from "components/LoadingSpan";
 import WorkflowTree from "./WorkflowTree";
@@ -78,10 +78,10 @@ export default {
             return this.itemContent ? this.itemContent.name : "...";
         },
         downloadUrl() {
-            return safePath(`/api/workflows/${this.args.workflow_id}/download?format=json-download`);
+            return withPrefix(`/api/workflows/${this.args.workflow_id}/download?format=json-download`);
         },
         importUrl() {
-            return safePath(`/workflow/imp?id=${this.args.workflow_id}`);
+            return withPrefix(`/workflow/imp?id=${this.args.workflow_id}`);
         },
         itemUrl() {
             return `/api/workflows/${this.args.workflow_id}/download?style=preview`;
diff --git a/client/src/components/Markdown/Markdown.vue b/client/src/components/Markdown/Markdown.vue
index 41b1d47ed64..6f43fef2bff 100644
--- a/client/src/components/Markdown/Markdown.vue
+++ b/client/src/components/Markdown/Markdown.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="markdown-wrapper">
-        <LoadingSpan v-if="loading" />
+        <loading-span v-if="loading" />
         <div v-else>
             <div>
                 <sts-download-button
@@ -28,7 +28,7 @@
                 </span>
             </div>
             <b-badge variant="info" class="w-100 rounded mb-3">
-                <div class="float-left m-1">Published with Galaxy {{ getVersion }} on {{ getTime }}</div>
+                <div class="float-left m-1">Published with Galaxy {{ version }} on {{ time }}</div>
                 <div class="float-right m-1">Identifier {{ markdownConfig.id }}</div>
             </b-badge>
             <div>
@@ -41,47 +41,18 @@
             </div>
             <div v-for="(obj, index) in markdownObjects" :key="index" class="markdown-components">
                 <p v-if="obj.name == 'default'" class="text-justify m-2" v-html="obj.content" />
-                <div v-else-if="obj.name == 'generate_galaxy_version'" class="galaxy-version">
-                    <pre><code>{{ getVersion }}</code></pre>
-                </div>
-                <div v-else-if="obj.name == 'generate_time'" class="galaxy-time">
-                    <pre><code>{{ getTime }}</code></pre>
-                </div>
-                <HistoryLink v-else-if="obj.name == 'history_link'" :args="obj.args" :histories="histories" />
-                <HistoryDatasetAsImage v-else-if="obj.name == 'history_dataset_as_image'" :args="obj.args" />
-                <HistoryDatasetLink v-else-if="obj.name == 'history_dataset_link'" :args="obj.args" />
-                <HistoryDatasetIndex v-else-if="obj.name == 'history_dataset_index'" :args="obj.args" />
-                <InvocationTime v-else-if="obj.name == 'invocation_time'" :args="obj.args" :invocations="invocations" />
-                <JobMetrics v-else-if="obj.name == 'job_metrics'" :args="obj.args" />
-                <JobParameters v-else-if="obj.name == 'job_parameters'" :args="obj.args" />
-                <WorkflowDisplay v-else-if="obj.name == 'workflow_display'" :args="obj.args" :workflows="workflows" />
-                <Visualization v-else-if="obj.name == 'visualization'" :args="obj.args" />
-                <HistoryDatasetCollectionDisplay
-                    v-else-if="obj.name == 'history_dataset_collection_display'"
-                    :args="obj.args"
-                    :collections="historyDatasetCollections" />
-                <ToolStd
-                    v-else-if="['tool_stdout', 'tool_stderr'].includes(obj.name)"
-                    :args="obj.args"
-                    :name="obj.name"
-                    :jobs="jobs" />
-                <HistoryDatasetDisplay
-                    v-else-if="['history_dataset_embedded', 'history_dataset_display'].includes(obj.name)"
-                    :args="obj.args"
-                    :datasets="historyDatasets"
-                    :embedded="obj.name == 'history_dataset_embedded'" />
-                <HistoryDatasetDetails
-                    v-else-if="
-                        [
-                            'history_dataset_name',
-                            'history_dataset_info',
-                            'history_dataset_peek',
-                            'history_dataset_type',
-                        ].includes(obj.name)
-                    "
+                <markdown-container
+                    v-else
                     :name="obj.name"
                     :args="obj.args"
-                    :datasets="historyDatasets" />
+                    :datasets="datasets"
+                    :collections="collections"
+                    :histories="histories"
+                    :invocations="invocations"
+                    :jobs="jobs"
+                    :time="time"
+                    :version="version"
+                    :workflows="workflows" />
             </div>
         </div>
     </div>
@@ -97,21 +68,9 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { faDownload, faEdit } from "@fortawesome/free-solid-svg-icons";
 
-import LoadingSpan from "components/LoadingSpan";
-import HistoryDatasetAsImage from "./Elements/HistoryDatasetAsImage";
-import HistoryDatasetDisplay from "./Elements/HistoryDatasetDisplay";
-import HistoryDatasetLink from "./Elements/HistoryDatasetLink";
-import HistoryDatasetIndex from "./Elements/HistoryDatasetIndex";
-import HistoryDatasetCollectionDisplay from "./Elements/HistoryDatasetCollection/CollectionDisplay";
-import HistoryDatasetDetails from "./Elements/HistoryDatasetDetails";
-import HistoryLink from "./Elements/HistoryLink";
-import InvocationTime from "./Elements/InvocationTime";
-import JobMetrics from "./Elements/JobMetrics";
-import JobParameters from "./Elements/JobParameters";
-import ToolStd from "./Elements/ToolStd";
-import WorkflowDisplay from "./Elements/Workflow/WorkflowDisplay";
-import Visualization from "./Elements/Visualization";
-import StsDownloadButton from "components/StsDownloadButton";
+import LoadingSpan from "components/LoadingSpan.vue";
+import StsDownloadButton from "components/StsDownloadButton.vue";
+import MarkdownContainer from "./MarkdownContainer.vue";
 
 const FUNCTION_VALUE_REGEX = `\\s*(?:[\\w_\\-]+|\\"[^\\"]+\\"|\\'[^\\']+\\')\\s*`;
 const FUNCTION_CALL = `\\s*[\\w\\|]+\\s*=` + FUNCTION_VALUE_REGEX;
@@ -132,21 +91,9 @@ library.add(faDownload, faEdit);
 export default {
     store: store,
     components: {
-        HistoryDatasetDetails,
-        HistoryDatasetAsImage,
-        HistoryDatasetCollectionDisplay,
-        HistoryDatasetDisplay,
-        HistoryDatasetIndex,
-        HistoryDatasetLink,
-        HistoryLink,
-        JobMetrics,
-        JobParameters,
-        LoadingSpan,
-        ToolStd,
-        WorkflowDisplay,
-        Visualization,
-        InvocationTime,
+        MarkdownContainer,
         FontAwesomeIcon,
+        LoadingSpan,
         StsDownloadButton,
     },
     props: {
@@ -175,9 +122,9 @@ export default {
         return {
             markdownObjects: [],
             markdownErrors: [],
-            historyDatasets: {},
+            datasets: {},
             histories: {},
-            historyDatasetCollections: {},
+            collections: {},
             workflows: {},
             jobs: {},
             invocations: {},
@@ -185,10 +132,10 @@ export default {
         };
     },
     computed: {
-        getVersion() {
-            return this.markdownConfig.generate_version || "Unknown Galaxy Version";
+        effectiveExportLink() {
+            return this.enable_beta_markdown_export ? this.exportLink : null;
         },
-        getTime() {
+        time() {
             const generateTime = this.markdownConfig.generate_time;
             if (generateTime) {
                 const date = new Date(generateTime);
@@ -202,8 +149,8 @@ export default {
             }
             return "unavailable";
         },
-        effectiveExportLink() {
-            return this.enable_beta_markdown_export ? this.exportLink : null;
+        version() {
+            return this.markdownConfig.generate_version || "Unknown Galaxy Version";
         },
     },
     watch: {
@@ -221,9 +168,9 @@ export default {
                 const markdown = config.content || config.markdown;
                 this.markdownErrors = config.errors || [];
                 this.markdownObjects = this.splitMarkdown(markdown);
-                this.historyDatasets = config.history_datasets || {};
+                this.datasets = config.history_datasets || {};
                 this.histories = config.histories || {};
-                this.historyDatasetCollections = config.history_dataset_collections || {};
+                this.collections = config.history_dataset_collections || {};
                 this.workflows = config.workflows || {};
                 this.jobs = config.jobs || {};
                 this.invocations = config.invocations || {};
diff --git a/client/src/components/Markdown/MarkdownContainer.test.js b/client/src/components/Markdown/MarkdownContainer.test.js
new file mode 100644
index 00000000000..0d0630afc14
--- /dev/null
+++ b/client/src/components/Markdown/MarkdownContainer.test.js
@@ -0,0 +1,106 @@
+import axios from "axios";
+import flushPromises from "flush-promises";
+import { mount } from "@vue/test-utils";
+import { getLocalVue } from "tests/jest/helpers";
+import MockAdapter from "axios-mock-adapter";
+import { withPrefix } from "utils/redirect";
+import MountTarget from "./MarkdownContainer.vue";
+
+// mock routes
+jest.mock("utils/redirect");
+withPrefix.mockImplementation((url) => url);
+
+const localVue = getLocalVue();
+const axiosMock = new MockAdapter(axios);
+
+async function mountComponent(propsData, apiMap = {}) {
+    axiosMock.reset();
+    for (const [method, apiDetails] of Object.entries(apiMap)) {
+        for (const [path, response] of Object.entries(apiDetails)) {
+            axiosMock[method](path).reply(200, response);
+        }
+    }
+    return mount(MountTarget, {
+        localVue,
+        propsData,
+        stubs: {
+            FontAwesomeIcon: true,
+        },
+    });
+}
+
+async function testCollapse(wrapper) {
+    const nolink = wrapper.find("a");
+    expect(nolink.exists()).toBe(false);
+    const collapse = "Click here to expand/collapse";
+    await wrapper.setProps({ args: { collapse } });
+    const link = wrapper.find("a");
+    expect(link.text()).toBe(collapse);
+    const container = wrapper.find(".collapse");
+    expect(container.attributes("style")).toBe("display: none;");
+    await link.trigger("click");
+    expect(container.attributes("style")).toBe("");
+}
+
+describe("MarkdownContainer", () => {
+    it("Renders version", async () => {
+        const version = "test_version";
+        const wrapper = await mountComponent({
+            name: "generate_galaxy_version",
+            args: {},
+            version,
+        });
+        const versionEl = wrapper.find(".galaxy-version");
+        expect(versionEl.exists()).toBe(true);
+        expect(versionEl.find("code").text()).toBe(version);
+        testCollapse(wrapper);
+    });
+
+    it("Renders time stamp", async () => {
+        const time = "test_time";
+        const wrapper = await mountComponent({
+            name: "generate_time",
+            args: {},
+            time,
+        });
+        const version = wrapper.find(".galaxy-time");
+        expect(version.exists()).toBe(true);
+        expect(version.find("code").text()).toBe(time);
+        testCollapse(wrapper);
+    });
+
+    it("Renders history link", async () => {
+        const wrapper = await mountComponent(
+            {
+                name: "history_link",
+                args: { history_id: "test_history_id" },
+                histories: { test_history_id: { name: "history_name" } },
+            },
+            {
+                onPost: { "/api/histories": {} },
+            }
+        );
+        const link = wrapper.find("a");
+        expect(link.text()).toBe("Click to Import History: history_name.");
+        await link.trigger("click");
+        const postedData = JSON.parse(axiosMock.history.post[0].data);
+        expect(postedData.history_id).toBe("test_history_id");
+        await flushPromises();
+        const error = wrapper.find(".text-success");
+        const message = error.find("span");
+        expect(message.text()).toBe("Successfully Imported History: history_name!");
+    });
+
+    it("Renders history link (with failing import error message)", async () => {
+        const wrapper = await mountComponent({
+            name: "history_link",
+            args: { history_id: "test_history_id" },
+            histories: { test_history_id: { name: "history_name" } },
+        });
+        await wrapper.find("a").trigger("click");
+        await flushPromises();
+        const error = wrapper.find(".text-danger");
+        const message = error.find("span");
+        expect(message.text()).toBe("Failed to Import History: history_name!");
+    });
+});
diff --git a/client/src/components/Markdown/MarkdownContainer.vue b/client/src/components/Markdown/MarkdownContainer.vue
new file mode 100644
index 00000000000..38ccbb72b2c
--- /dev/null
+++ b/client/src/components/Markdown/MarkdownContainer.vue
@@ -0,0 +1,110 @@
+<script setup>
+import { computed, ref } from "vue";
+import HistoryDatasetAsImage from "./Elements/HistoryDatasetAsImage.vue";
+import HistoryDatasetDisplay from "./Elements/HistoryDatasetDisplay.vue";
+import HistoryDatasetLink from "./Elements/HistoryDatasetLink.vue";
+import HistoryDatasetIndex from "./Elements/HistoryDatasetIndex.vue";
+import HistoryDatasetCollectionDisplay from "./Elements/HistoryDatasetCollection/CollectionDisplay.vue";
+import HistoryDatasetDetails from "./Elements/HistoryDatasetDetails.vue";
+import HistoryLink from "./Elements/HistoryLink.vue";
+import InvocationTime from "./Elements/InvocationTime.vue";
+import JobMetrics from "./Elements/JobMetrics.vue";
+import JobParameters from "./Elements/JobParameters.vue";
+import ToolStd from "./Elements/ToolStd.vue";
+import WorkflowDisplay from "./Elements/Workflow/WorkflowDisplay.vue";
+import Visualization from "./Elements/Visualization.vue";
+
+const toggle = ref(false);
+const props = defineProps({
+    name: {
+        type: String,
+        required: true,
+    },
+    args: {
+        type: Object,
+        required: true,
+    },
+    datasets: {
+        type: Object,
+        default: null,
+    },
+    collections: {
+        type: Object,
+        default: null,
+    },
+    histories: {
+        type: Object,
+        default: null,
+    },
+    invocations: {
+        type: Object,
+        default: null,
+    },
+    jobs: {
+        type: Object,
+        default: null,
+    },
+    time: {
+        type: String,
+        default: null,
+    },
+    version: {
+        type: String,
+        default: null,
+    },
+    workflows: {
+        type: Object,
+        default: null,
+    },
+});
+
+const isCollapsible = computed(() => props.args.collapse !== undefined);
+const isVisible = computed(() => !isCollapsible.value || toggle.value);
+</script>
+
+<template>
+    <div>
+        <b-link v-if="isCollapsible" class="font-weight-bold" @click="toggle = !toggle">
+            {{ args.collapse }}
+        </b-link>
+        <b-collapse :visible="isVisible">
+            <div v-if="name == 'generate_galaxy_version'" class="galaxy-version">
+                <pre><code>{{ version }}</code></pre>
+            </div>
+            <div v-else-if="name == 'generate_time'" class="galaxy-time">
+                <pre><code>{{ time }}</code></pre>
+            </div>
+            <HistoryLink v-else-if="name == 'history_link'" :args="args" :histories="histories" />
+            <HistoryDatasetAsImage v-else-if="name == 'history_dataset_as_image'" :args="args" />
+            <HistoryDatasetLink v-else-if="name == 'history_dataset_link'" :args="args" />
+            <HistoryDatasetIndex v-else-if="name == 'history_dataset_index'" :args="args" />
+            <InvocationTime v-else-if="name == 'invocation_time'" :args="args" :invocations="invocations" />
+            <JobMetrics v-else-if="name == 'job_metrics'" :args="args" />
+            <JobParameters v-else-if="name == 'job_parameters'" :args="args" />
+            <WorkflowDisplay v-else-if="name == 'workflow_display'" :args="args" :workflows="workflows" />
+            <Visualization v-else-if="name == 'visualization'" :args="args" />
+            <HistoryDatasetCollectionDisplay
+                v-else-if="name == 'history_dataset_collection_display'"
+                :args="args"
+                :collections="collections" />
+            <ToolStd v-else-if="['tool_stdout', 'tool_stderr'].includes(name)" :args="args" :name="name" :jobs="jobs" />
+            <HistoryDatasetDisplay
+                v-else-if="['history_dataset_embedded', 'history_dataset_display'].includes(name)"
+                :args="args"
+                :datasets="datasets"
+                :embedded="name == 'history_dataset_embedded'" />
+            <HistoryDatasetDetails
+                v-else-if="
+                    [
+                        'history_dataset_name',
+                        'history_dataset_info',
+                        'history_dataset_peek',
+                        'history_dataset_type',
+                    ].includes(name)
+                "
+                :name="name"
+                :args="args"
+                :datasets="datasets" />
+        </b-collapse>
+    </div>
+</template>
diff --git a/client/src/components/Markdown/MarkdownEditor.vue b/client/src/components/Markdown/MarkdownEditor.vue
index 5fe43e0dc69..1ea6f7429be 100644
--- a/client/src/components/Markdown/MarkdownEditor.vue
+++ b/client/src/components/Markdown/MarkdownEditor.vue
@@ -2,7 +2,7 @@
     <div>
         <SidePanel id="left" side="left">
             <template v-slot:panel>
-                <MarkdownToolBox :get-manager="getManager" @onInsert="onInsert" />
+                <MarkdownToolBox :steps="steps" @onInsert="onInsert" />
             </template>
         </SidePanel>
         <div id="center" class="workflow-markdown-editor">
@@ -72,9 +72,9 @@ export default {
             type: Object,
             default: null,
         },
-        getManager: {
-            type: Function,
-            default: null,
+        steps: {
+            type: Object,
+            required: true,
         },
         title: {
             type: String,
diff --git a/client/src/components/Markdown/MarkdownToolBox.vue b/client/src/components/Markdown/MarkdownToolBox.vue
index 21991f749f8..720d2c9758b 100644
--- a/client/src/components/Markdown/MarkdownToolBox.vue
+++ b/client/src/components/Markdown/MarkdownToolBox.vue
@@ -112,8 +112,8 @@ export default {
         ToolSection,
     },
     props: {
-        getManager: {
-            type: Function,
+        steps: {
+            type: Object,
             default: null,
         },
     },
@@ -244,14 +244,11 @@ export default {
     },
     computed: {
         isWorkflow() {
-            return !!this.nodes;
+            return !!this.steps;
         },
         hasVisualizations() {
             return this.visualizationSection.elems.length > 0;
         },
-        nodes() {
-            return this.getManager && this.getManager().nodes;
-        },
     },
     created() {
         this.getVisualizations();
@@ -259,21 +256,21 @@ export default {
     methods: {
         getSteps() {
             const steps = [];
-            this.nodes &&
-                Object.values(this.nodes).forEach((node) => {
-                    if (node.label) {
-                        steps.push(node.label);
+            this.steps &&
+                Object.values(this.steps).forEach((step) => {
+                    if (step.label || step.content_id) {
+                        steps.push(step.label || step.content_id);
                     }
                 });
             return steps;
         },
         getOutputs() {
             const outputLabels = [];
-            this.nodes &&
-                Object.values(this.nodes).forEach((node) => {
-                    node.activeOutputs.getAll().forEach((output) => {
-                        if (output.label) {
-                            outputLabels.push(output.label);
+            this.steps &&
+                Object.values(this.steps).forEach((step) => {
+                    step.workflow_outputs.forEach((workflowOutput) => {
+                        if (workflowOutput.label) {
+                            outputLabels.push(workflowOutput.label);
                         }
                     });
                 });
diff --git a/client/src/components/Masthead/Masthead.test.js b/client/src/components/Masthead/Masthead.test.js
index af420d9d463..154e7cf7216 100644
--- a/client/src/components/Masthead/Masthead.test.js
+++ b/client/src/components/Masthead/Masthead.test.js
@@ -1,12 +1,15 @@
 import Vuex from "vuex";
 import { default as Masthead } from "./Masthead.vue";
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue, mockModule } from "tests/jest/helpers";
 import { WindowManager } from "layout/window-manager";
 import { loadWebhookMenuItems } from "./_webhooks";
-import { userStore } from "store/userStore";
+import { userStore, userFlagsStore } from "store/userStore";
 import { configStore } from "store/configStore";
 import { getActiveTab } from "./utilities";
+import { createTestingPinia } from "@pinia/testing";
+import { PiniaVuePlugin, setActivePinia } from "pinia";
+import { useEntryPointStore } from "stores/entryPointStore";
 
 jest.mock("app");
 jest.mock("./_webhooks");
@@ -20,8 +23,7 @@ describe("Masthead.vue", () => {
     let windowManager;
     let tabs;
     let store;
-    let state;
-    let actions;
+    let testPinia;
 
     function stubLoadWebhooks(items) {
         items.push({
@@ -36,23 +38,13 @@ describe("Masthead.vue", () => {
 
     beforeEach(() => {
         localVue = getLocalVue();
-
+        localVue.use(PiniaVuePlugin);
+        testPinia = createTestingPinia();
         store = new Vuex.Store({
             modules: {
-                user: {
-                    state,
-                    actions: {
-                        loadUser: jest.fn(),
-                    },
-                    getters: userStore.getters,
-                    namespaced: true,
-                },
-                config: {
-                    state,
-                    actions,
-                    getters: configStore.getters,
-                    namespaced: true,
-                },
+                user: mockModule(userStore),
+                config: mockModule(configStore),
+                userFlags: mockModule(userFlagsStore),
             },
         });
 
@@ -89,7 +81,9 @@ describe("Masthead.vue", () => {
                 initialActiveTab,
             },
             store,
+            provide: { store },
             localVue,
+            pinia: testPinia,
         });
     });
 
@@ -99,7 +93,7 @@ describe("Masthead.vue", () => {
     });
 
     it("should render simple tab item links", () => {
-        expect(wrapper.findAll("li.nav-item").length).toBe(5);
+        expect(wrapper.findAll("li.nav-item").length).toBe(6);
         // Ensure specified link title respected.
         expect(wrapper.find("#analysis a").text()).toBe("Analyze");
         expect(wrapper.find("#analysis a").attributes("href")).toBe("root");
@@ -119,6 +113,7 @@ describe("Masthead.vue", () => {
     it("should make hidden tabs hidden", () => {
         expect(wrapper.find("#analysis").attributes().style).not.toEqual(expect.stringContaining("display: none"));
         expect(wrapper.find("#hiddentab").attributes().style).toEqual(expect.stringContaining("display: none"));
+        expect(wrapper.get("#interactive").isVisible()).toBeFalsy();
     });
 
     it("should highlight the active tab", () => {
@@ -136,4 +131,24 @@ describe("Masthead.vue", () => {
     it("should load webhooks on creation", async () => {
         expect(wrapper.find("#extension a").text()).toBe("Extension Point");
     });
+
+    it("shows link to interactive tools if any is active", async () => {
+        setActivePinia(testPinia);
+        const entryPointStore = useEntryPointStore();
+        entryPointStore.entryPoints = [
+            {
+                model_class: "InteractiveToolEntryPoint",
+                id: "52e496b945151ee8",
+                job_id: "52e496b945151ee8",
+                name: "Jupyter Interactive Tool",
+                active: true,
+                created_time: "2020-02-24T15:59:18.122103",
+                modified_time: "2020-02-24T15:59:20.428594",
+                target: "http://52e496b945151ee8-be8a5bee5d5849a5b4e035b51305256e.interactivetoolentrypoint.interactivetool.localhost:8080/ipython/lab",
+            },
+        ];
+        // avoid race condition with store's reactivity
+        await new Promise((_) => setTimeout(_, 10));
+        expect(wrapper.get("#interactive").isVisible()).toBeTruthy();
+    });
 });
diff --git a/client/src/components/Masthead/Masthead.vue b/client/src/components/Masthead/Masthead.vue
index f6570d2f0c3..36be380dd1a 100644
--- a/client/src/components/Masthead/Masthead.vue
+++ b/client/src/components/Masthead/Masthead.vue
@@ -3,17 +3,16 @@ import { BNavbar, BNavbarBrand, BNavbarNav } from "bootstrap-vue";
 import MastheadItem from "./MastheadItem";
 import { loadWebhookMenuItems } from "./_webhooks";
 import QuotaMeter from "./QuotaMeter";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 import { getActiveTab } from "./utilities";
-import { watch, computed, ref } from "vue";
-import { onMounted } from "vue";
+import { watch, ref, reactive } from "vue";
+import { onMounted, onBeforeMount } from "vue";
 import { useRoute } from "vue-router/composables";
+import { useEntryPointStore } from "stores/entryPointStore";
 
-// basics
 const route = useRoute();
 const emit = defineEmits(["open-url"]);
 
-/* props */
 const props = defineProps({
     tabs: {
         type: Array,
@@ -45,24 +44,31 @@ const props = defineProps({
     },
 });
 
-/* refs */
 const activeTab = ref(props.initialActiveTab);
 const extensionTabs = ref([]);
 const windowToggle = ref(false);
 
-/* computed */
-const allTabs = computed(() => [].concat(props.tabs, extensionTabs.value));
+let entryPointStore;
+const itsMenu = reactive({
+    id: "interactive",
+    url: "/interactivetool_entry_points/list",
+    tooltip: "See Running Interactive Tools",
+    icon: "fa-cogs",
+    hidden: true,
+});
 
-/* methods */
 function setActiveTab() {
     const currentRoute = route.path;
     activeTab.value = getActiveTab(currentRoute, props.tabs) || activeTab.value;
 }
+
 function onWindowToggle() {
     windowToggle.value = !windowToggle.value;
 }
+function updateVisibility(isActive) {
+    itsMenu.hidden = !isActive;
+}
 
-/* watchers */
 watch(
     () => route.path,
     () => {
@@ -71,6 +77,13 @@ watch(
 );
 
 /* lifecyle */
+onBeforeMount(() => {
+    entryPointStore = useEntryPointStore();
+    entryPointStore.ensurePollingEntryPoints();
+    entryPointStore.$subscribe((mutation, state) => {
+        updateVisibility(state.entryPoints.length > 0);
+    });
+});
 onMounted(() => {
     loadWebhookMenuItems(extensionTabs.value);
     setActiveTab();
@@ -80,26 +93,111 @@ onMounted(() => {
 <template>
     <b-navbar id="masthead" type="dark" role="navigation" aria-label="Main" class="justify-content-between">
         <b-navbar-nav>
-            <b-navbar-brand id="analysis" :href="safePath(logoUrl)" aria-label="homepage">
-                <b-button v-b-tooltip.hover variant="link" size="sm" title="Home">
-                    <img alt="logo" :src="safePath(logoSrc)" />
-                    <img v-if="logoSrcSecondary" alt="logo" :src="safePath(logoSrcSecondary)" />
-                </b-button>
+            <b-navbar-brand
+                v-b-tooltip.hover
+                class="ml-2 mr-1"
+                title="Home"
+                aria-label="homepage"
+                :href="withPrefix(logoUrl)">
+                <img alt="logo" :src="withPrefix(logoSrc)" />
+                <img v-if="logoSrcSecondary" alt="logo" :src="withPrefix(logoSrcSecondary)" />
             </b-navbar-brand>
-            <b-nav-item v-if="brand" class="navbar-brand-title" disabled>
+            <span v-if="brand" class="navbar-text">
                 {{ brand }}
-            </b-nav-item>
+            </span>
         </b-navbar-nav>
         <b-navbar-nav>
             <masthead-item
-                v-for="(tab, idx) in allTabs"
+                v-for="(tab, idx) in props.tabs"
                 v-show="tab.hidden !== true"
                 :key="`tab-${idx}`"
                 :tab="tab"
                 :active-tab="activeTab"
                 @open-url="emit('open-url', $event)" />
+            <masthead-item
+                v-show="itsMenu.hidden !== true"
+                :key="`its-tab`"
+                :tab="itsMenu"
+                :active-tab="activeTab"
+                @open-url="emit('open-url', $event)" />
+            <masthead-item
+                v-for="(tab, idx) in extensionTabs"
+                v-show="tab.hidden !== true"
+                :key="`extension-tab-${idx}`"
+                :tab="tab"
+                :active-tab="activeTab"
+                @open-url="emit('open-url', $event)" />
             <masthead-item v-if="windowTab" :tab="windowTab" :toggle="windowToggle" @click="onWindowToggle" />
         </b-navbar-nav>
         <quota-meter />
     </b-navbar>
 </template>
+
+<style scoped lang="scss">
+@import "theme/blue.scss";
+
+#masthead {
+    padding: 0;
+    margin-bottom: 0;
+    background: var(--masthead-color);
+    height: $masthead-height;
+    &:deep(.navbar-nav) {
+        height: $masthead-height;
+        & > li {
+            // This allows the background color to fill the full height of the
+            // masthead, while still keeping the contents centered (using flex)
+            min-height: 100%;
+            display: flex;
+            align-items: center;
+            background: var(--masthead-link-color);
+            &:hover {
+                background: var(--masthead-link-hover);
+            }
+            &.show,
+            &.active {
+                background: var(--masthead-link-active);
+                .nav-link {
+                    color: var(--masthead-text-active);
+                }
+            }
+            .nav-link {
+                position: relative;
+                cursor: pointer;
+                text-decoration: none;
+                color: var(--masthead-text-color);
+                &:hover {
+                    color: var(--masthead-text-hover);
+                }
+                &.nav-icon {
+                    font-size: 1.3em;
+                    .nav-note {
+                        position: absolute;
+                        left: 1.9rem;
+                        top: 1.9rem;
+                        font-size: 0.6rem;
+                        font-weight: bold;
+                    }
+                }
+                &.toggle {
+                    color: var(--masthead-text-hover);
+                }
+            }
+        }
+    }
+    .navbar-brand {
+        cursor: pointer;
+        img {
+            display: inline;
+            border: none;
+            height: 2.3rem;
+        }
+    }
+    .navbar-text {
+        font-weight: bold;
+        font-family: Verdana, sans-serif;
+        font-size: 1rem;
+        line-height: 2rem;
+        color: var(--masthead-text-color);
+    }
+}
+</style>
diff --git a/client/src/components/Masthead/MastheadItem.test.js b/client/src/components/Masthead/MastheadItem.test.js
index 3fcad3f2f8a..40a299f7aac 100644
--- a/client/src/components/Masthead/MastheadItem.test.js
+++ b/client/src/components/Masthead/MastheadItem.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import MastheadItem from "./MastheadItem.vue";
 
 describe("MastheadItem.vue", () => {
diff --git a/client/src/components/Masthead/MastheadItem.vue b/client/src/components/Masthead/MastheadItem.vue
index 00dcefeb971..b28a9dca7a1 100644
--- a/client/src/components/Masthead/MastheadItem.vue
+++ b/client/src/components/Masthead/MastheadItem.vue
@@ -2,7 +2,7 @@
 import Vue from "vue";
 import { VBPopoverPlugin, VBTooltipPlugin } from "bootstrap-vue";
 import { BNavItem, BNavItemDropdown, BDropdownItem } from "bootstrap-vue";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 import { ref, computed } from "vue";
 import { getCurrentInstance } from "vue";
 
@@ -32,7 +32,7 @@ const props = defineProps({
 /* computed */
 const menu = computed(() => props.tab.menu);
 const popoverNote = computed(
-    () => `Please <a href="${safePath("/login")}">log in or register</a> to use this feature.`
+    () => `Please <a href="${withPrefix("/login")}">log in or register</a> to use this feature.`
 );
 const classes = computed(() => {
     const isActiveTab = props.tab.id == props.activeTab;
@@ -79,7 +79,7 @@ function open(tab, event) {
         v-b-tooltip.hover.bottom
         v-b-popover.manual.bottom="{ id: tab.id, content: popoverNote, html: true }"
         :class="classes"
-        :href="safePath(tab.url)"
+        :href="withPrefix(tab.url)"
         :target="tab.target || '_parent'"
         :link-classes="linkClasses"
         :title="tab.tooltip"
@@ -114,7 +114,7 @@ function open(tab, event) {
             <b-dropdown-item
                 v-else-if="item.hidden !== true"
                 :key="`item-${idx}`"
-                :href="safePath(item.url)"
+                :href="withPrefix(item.url)"
                 :target="item.target || '_parent'"
                 role="menuitem"
                 :active="item.disabled"
diff --git a/client/src/components/Masthead/QuotaMeter.test.js b/client/src/components/Masthead/QuotaMeter.test.js
index 9c774d7c072..ac2fbdae924 100644
--- a/client/src/components/Masthead/QuotaMeter.test.js
+++ b/client/src/components/Masthead/QuotaMeter.test.js
@@ -1,7 +1,7 @@
 import Vuex from "vuex";
 import QuotaMeter from "./QuotaMeter.vue";
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import { userStore } from "store/userStore";
 import { configStore } from "store/configStore";
 
diff --git a/client/src/components/Masthead/QuotaMeter.vue b/client/src/components/Masthead/QuotaMeter.vue
index 15cc33fbf02..840ad850581 100644
--- a/client/src/components/Masthead/QuotaMeter.vue
+++ b/client/src/components/Masthead/QuotaMeter.vue
@@ -77,8 +77,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "theme/blue.scss";
-
 .quota-meter {
     position: relative;
     right: 0.8rem;
@@ -104,8 +102,14 @@ export default {
     }
 
     .quota-text {
-        color: $brand-light;
+        color: var(--masthead-text-color);
         text-decoration: none;
     }
+
+    :deep(a) {
+        &:focus-visible {
+            outline: 2px solid var(--masthead-text-hover);
+        }
+    }
 }
 </style>
diff --git a/client/src/components/NewUserWelcome/NewUserWelcome.test.js b/client/src/components/NewUserWelcome/NewUserWelcome.test.js
index 7de30edfb80..1f8738c19ee 100644
--- a/client/src/components/NewUserWelcome/NewUserWelcome.test.js
+++ b/client/src/components/NewUserWelcome/NewUserWelcome.test.js
@@ -1,5 +1,5 @@
 import { shallowMount, mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import testData from "./testData.json";
 import NewUserWelcome from "./NewUserWelcome.vue";
 import { getResource } from "./getResource";
diff --git a/client/src/components/PageDisplay/PageDisplay.vue b/client/src/components/PageDisplay/PageDisplay.vue
index 60b9e8134ea..9994a67a027 100644
--- a/client/src/components/PageDisplay/PageDisplay.vue
+++ b/client/src/components/PageDisplay/PageDisplay.vue
@@ -20,7 +20,7 @@
 
 <script>
 import { urlData } from "utils/url";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 import ConfigProvider from "components/providers/ConfigProvider";
 import Markdown from "components/Markdown/Markdown";
 import Published from "components/Common/Published";
@@ -52,7 +52,7 @@ export default {
             return `${this.dataUrl}.pdf`;
         },
         editUrl() {
-            return `/page/edit_content?id=${this.pageId}`;
+            return `/pages/editor?id=${this.pageId}`;
         },
     },
     created() {
@@ -62,7 +62,7 @@ export default {
     },
     methods: {
         onEdit() {
-            window.location = safePath(this.editUrl);
+            window.location = withPrefix(this.editUrl);
         },
         stsUrl(config) {
             return `${this.dataUrl}/prepare_download`;
diff --git a/client/src/components/PageDisplay/PageHtml.vue b/client/src/components/PageDisplay/PageHtml.vue
index e010d98f689..337333611bd 100644
--- a/client/src/components/PageDisplay/PageHtml.vue
+++ b/client/src/components/PageDisplay/PageHtml.vue
@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 export default {
     props: {
         page: {
@@ -50,16 +50,16 @@ export default {
         processItem(modelClass, modelId) {
             let html = null;
             if (modelClass == "StoredWorkflow") {
-                const url = safePath(`/published/workflow?id=${modelId}`);
+                const url = withPrefix(`/published/workflow?id=${modelId}`);
                 html = `<a href='${url}'>View Workflow<a>`;
             } else if (modelClass == "History") {
-                const url = safePath(`/published/history?id=${modelId}`);
+                const url = withPrefix(`/published/history?id=${modelId}`);
                 html = `<a href='${url}'>View History<a>`;
             } else if (modelClass == "HistoryDatasetAssociation") {
-                const url = safePath(`/datasets/${modelId}/preview`);
+                const url = withPrefix(`/datasets/${modelId}/preview`);
                 html = `<a href='${url}'>View Dataset<a>`;
             } else if (modelClass == "Visualization") {
-                const url = safePath(`/published/history?id=${modelId}`);
+                const url = withPrefix(`/published/history?id=${modelId}`);
                 html = `<a href='${url}'>View Visualization<a>`;
             } else {
                 html = `Item of type '${modelClass}' cannot be embedded.`;
diff --git a/client/src/components/Panels/Buttons/FavoritesButton.test.js b/client/src/components/Panels/Buttons/FavoritesButton.test.js
index 913c77cb780..e603c954774 100644
--- a/client/src/components/Panels/Buttons/FavoritesButton.test.js
+++ b/client/src/components/Panels/Buttons/FavoritesButton.test.js
@@ -1,4 +1,4 @@
-import { mockModule, getLocalVue } from "jest/helpers";
+import { mockModule, getLocalVue } from "tests/jest/helpers";
 import { userStore } from "store/userStore";
 import Vuex from "vuex";
 import FavoritesButton from "./FavoritesButton";
diff --git a/client/src/components/Panels/Common/Tool.test.js b/client/src/components/Panels/Common/Tool.test.js
index 6782cdf79af..c41e393224c 100644
--- a/client/src/components/Panels/Common/Tool.test.js
+++ b/client/src/components/Panels/Common/Tool.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import Tool from "./Tool";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/Panels/Common/ToolSearch.test.js b/client/src/components/Panels/Common/ToolSearch.test.js
index 48b92ba47e7..2e5a0a6988e 100644
--- a/client/src/components/Panels/Common/ToolSearch.test.js
+++ b/client/src/components/Panels/Common/ToolSearch.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import DelayedInput from "components/Common/DelayedInput";
 import ToolSearch from "./ToolSearch";
 const localVue = getLocalVue();
diff --git a/client/src/components/Panels/Common/ToolSection.test.js b/client/src/components/Panels/Common/ToolSection.test.js
index 04e0dca33ac..6e4a8582cc5 100644
--- a/client/src/components/Panels/Common/ToolSection.test.js
+++ b/client/src/components/Panels/Common/ToolSection.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import ToolSection from "./ToolSection";
 
 import { useConfig } from "composables/config";
diff --git a/client/src/components/Panels/ToolBox.test.js b/client/src/components/Panels/ToolBox.test.js
index b23a76e90dc..26180d4977a 100644
--- a/client/src/components/Panels/ToolBox.test.js
+++ b/client/src/components/Panels/ToolBox.test.js
@@ -1,6 +1,6 @@
 import Vuex from "vuex";
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import MockAdapter from "axios-mock-adapter";
 import axios from "axios";
 import { filterToolSections, filterTools } from "./utilities";
diff --git a/client/src/components/Panels/ToolBox.vue b/client/src/components/Panels/ToolBox.vue
index ae250416af5..645f2eb6bd1 100644
--- a/client/src/components/Panels/ToolBox.vue
+++ b/client/src/components/Panels/ToolBox.vue
@@ -70,7 +70,8 @@
 <script>
 import ToolSection from "./Common/ToolSection";
 import ToolSearch from "./Common/ToolSearch";
-import { UploadButton, openGlobalUploadModal } from "components/Upload";
+import { UploadButton } from "components/Upload";
+import { useGlobalUploadModal } from "composables/globalUploadModal";
 import FavoritesButton from "./Buttons/FavoritesButton";
 import PanelViewButton from "./Buttons/PanelViewButton";
 import { filterToolSections, filterTools, hasResults } from "./utilities";
@@ -106,6 +107,10 @@ export default {
             default: _l("Workflows"),
         },
     },
+    setup() {
+        const { openGlobalUploadModal } = useGlobalUploadModal();
+        return { openGlobalUploadModal };
+    },
     data() {
         return {
             query: null,
@@ -171,7 +176,7 @@ export default {
         onOpen(tool, evt) {
             if (tool.id === "upload1") {
                 evt.preventDefault();
-                openGlobalUploadModal();
+                this.openGlobalUploadModal();
             } else if (tool.form_style === "regular") {
                 evt.preventDefault();
                 // encode spaces in tool.id
diff --git a/client/src/components/RuleBuilder/SavedRulesSelector.test.js b/client/src/components/RuleBuilder/SavedRulesSelector.test.js
index 829931127ed..6d06843d08f 100644
--- a/client/src/components/RuleBuilder/SavedRulesSelector.test.js
+++ b/client/src/components/RuleBuilder/SavedRulesSelector.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import SavedRulesSelector from "components/RuleBuilder/SavedRulesSelector";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/StsDownloadButton.test.js b/client/src/components/StsDownloadButton.test.js
index 3e62e3a36f5..af99f7c0ed1 100644
--- a/client/src/components/StsDownloadButton.test.js
+++ b/client/src/components/StsDownloadButton.test.js
@@ -1,7 +1,7 @@
 import MockConfigProvider from "components/providers/MockConfigProvider";
 import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import StsDownloadButton from "./StsDownloadButton";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
diff --git a/client/src/components/StsDownloadButton.vue b/client/src/components/StsDownloadButton.vue
index 39a9613928c..a7e9456b847 100644
--- a/client/src/components/StsDownloadButton.vue
+++ b/client/src/components/StsDownloadButton.vue
@@ -27,7 +27,7 @@ library.add(faDownload, faSpinner);
 import ConfigProvider from "components/providers/ConfigProvider";
 import { Toast } from "composables/toast";
 import axios from "axios";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 export default {
     components: {
         ConfigProvider,
@@ -76,12 +76,14 @@ export default {
         },
         onDownload(config) {
             if (!config.enable_celery_tasks) {
-                console.log("celery tasks not enabled - setting href to fallback URL.");
-                window.location.assign(safePath(this.fallbackUrl));
-                return;
+                window.location.assign(withPrefix(this.fallbackUrl));
+            } else {
+                this.waiting = true;
+                axios
+                    .post(this.downloadEndpoint, this.postParameters)
+                    .then(this.handleInitialize)
+                    .catch(this.handleError);
             }
-            this.waiting = true;
-            axios.post(this.downloadEndpoint, this.postParameters).then(this.handleInitialize).catch(this.handleError);
         },
         handleInitialize(response) {
             const storageRequestId = response.data.storage_request_id;
diff --git a/client/src/components/Tags/Tags.test.js b/client/src/components/Tags/Tags.test.js
index 86e2986a81e..602a52a7a6c 100644
--- a/client/src/components/Tags/Tags.test.js
+++ b/client/src/components/Tags/Tags.test.js
@@ -3,7 +3,7 @@ import { mount } from "@vue/test-utils";
 import Tags from "./Tags";
 import { TagService } from "./tagService";
 import { tagStore } from "store/tagStore";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 
 jest.mock("./tagService");
 
diff --git a/client/src/components/Tags/model.js b/client/src/components/Tags/model.js
index 71282f924cb..ced4f989655 100644
--- a/client/src/components/Tags/model.js
+++ b/client/src/components/Tags/model.js
@@ -9,76 +9,55 @@ import { keyedColorScheme } from "utils/color";
 // separated by a period, and then an optional value after a colon.
 export const VALID_TAG_RE = /^([^\s.:])+(.[^\s.:]+)*(:[^\s.:]+)?$/;
 
-function TagModel(props = {}) {
-    this.text = "";
+export class TagModel {
+    /**
+     * @param {string || object} data
+     */
+    constructor(data) {
+        let props = {};
 
-    // special handling for name:thing tags
-    if (props.text && props.text.startsWith("#")) {
-        props.text = props.text.replace("#", "name:");
+        switch (typeof data) {
+            case "string":
+                props = { text: data };
+                break;
+            case "object":
+                props = data;
+                break;
+        }
+
+        Object.assign(this, props);
+
+        this.text = props.text ?? "";
+        this.label = this.text.replace(/^name:/, "#");
+        this.text = this.text.replace(/^#/, "name:");
+        this.style = "";
+
+        if (this.text.startsWith("name:")) {
+            this.style += "font-weight: bold;";
+        }
+
+        const { primary, darker } = keyedColorScheme(this.text);
+
+        this.style += `background-color: ${primary};`;
+        this.style += "color: black;";
+        this.style += `border-color: ${darker};`;
+
+        this.valid = VALID_TAG_RE.test(this.text);
     }
 
-    Object.assign(this, props);
+    equals(otherTag) {
+        return this.text === otherTag.text;
+    }
 
-    // Need to do Object.defineProperty instead of a class getter to make
-    // style enumerable for vue-tags-input
-    Object.defineProperty(this, "style", {
-        enumerable: true,
-        get: function () {
-            const { primary, darker } = keyedColorScheme(this.text);
-
-            const styles = {
-                "background-color": primary,
-                color: "black",
-                "border-color": darker,
-            };
-            if (this.text.startsWith("name:")) {
-                styles["font-weight"] = "bold";
-            }
-
-            return Object.keys(styles)
-                .map((prop) => `${prop}: ${styles[prop]}`)
-                .join(";");
-        },
-    });
-
-    // Changes name:foo to #foo
-    Object.defineProperty(this, "label", {
-        enumerable: true,
-        get: function () {
-            return this.text.startsWith("name:") ? this.text.replace("name:", "#") : this.text;
-        },
-    });
-
-    // valid flag
-    Object.defineProperty(this, "valid", {
-        enumerable: false,
-        get: function () {
-            return VALID_TAG_RE.test(this.text);
-        },
-    });
+    toString() {
+        return this.text;
+    }
 }
 
-TagModel.prototype.equals = function (otherTag) {
-    return this.text == otherTag.text;
-};
-
-TagModel.prototype.toString = function () {
-    return this.text;
-};
-
 // Public factory
 
 export function createTag(data) {
-    let props = {};
-    switch (typeof data) {
-        case "string":
-            props = { text: data };
-            break;
-        case "object":
-            props = Object.assign({}, data);
-            break;
-    }
-    return new TagModel(props);
+    return new TagModel(data);
 }
 
 // Returns tags in "newTags" that aren't present in "existingTags"
diff --git a/client/src/components/TagsMultiselect/StatelessTags.test.js b/client/src/components/TagsMultiselect/StatelessTags.test.js
new file mode 100644
index 00000000000..043220722c5
--- /dev/null
+++ b/client/src/components/TagsMultiselect/StatelessTags.test.js
@@ -0,0 +1,136 @@
+import { getLocalVue } from "tests/jest/helpers";
+import { mount } from "@vue/test-utils";
+import { useUserTags } from "composables/user";
+import { useToast } from "composables/toast";
+import { computed } from "vue";
+import StatelessTags from "./StatelessTags";
+
+const autocompleteTags = ["#named_user_tag", "abc", "my_tag"];
+
+const localVue = getLocalVue();
+
+const mountWithProps = (props) => {
+    return mount(StatelessTags, {
+        propsData: props,
+        localVue,
+    });
+};
+
+jest.mock("composables/user");
+const addLocalTagMock = jest.fn((tag) => tag);
+useUserTags.mockReturnValue({
+    userTags: computed(() => autocompleteTags),
+    addLocalTag: addLocalTagMock,
+});
+
+jest.mock("composables/toast");
+const warningMock = jest.fn((message, title) => {
+    return { message, title };
+});
+useToast.mockReturnValue({
+    warning: warningMock,
+});
+
+describe("StatelessTags", () => {
+    it("shows tags", () => {
+        const wrapper = mountWithProps({
+            value: ["tag_1", "tag_2", "tags:tag_3"],
+            disabled: true,
+        });
+
+        expect(wrapper.find(".tag").exists()).toBe(true);
+
+        const tags = wrapper.findAll(".tag");
+        expect(tags.length).toBe(3);
+        expect(tags.at(0).text()).toBe("tag_1");
+        expect(tags.at(1).text()).toBe("tag_2");
+        expect(tags.at(2).text()).toBe("tags:tag_3");
+    });
+
+    it("formats named tags", () => {
+        const wrapper = mountWithProps({
+            value: ["name:tag_1", "tag_2", "name:tag_3"],
+            disabled: true,
+        });
+
+        const tags = wrapper.findAll(".tag");
+        expect(tags.at(0).text()).toBe("#tag_1");
+        expect(tags.at(1).text()).toBe("tag_2");
+        expect(tags.at(2).text()).toBe("#tag_3");
+    });
+
+    it("shows autocomplete options", async () => {
+        const wrapper = mountWithProps({
+            disabled: false,
+        });
+
+        const multiselect = wrapper.find(".multiselect");
+
+        multiselect.find("button").trigger("click");
+        await wrapper.vm.$nextTick();
+
+        const options = multiselect.findAll(".multiselect-option");
+        const visibleOptions = options.filter((option) => option.isVisible());
+
+        expect(visibleOptions.length).toBe(autocompleteTags.length);
+
+        visibleOptions.wrappers.forEach((option, i) => {
+            expect(option.text()).toContain(autocompleteTags[i]);
+        });
+    });
+
+    it("adds new tags", async () => {
+        const wrapper = mountWithProps({
+            disabled: false,
+        });
+
+        const multiselect = wrapper.find(".multiselect");
+
+        multiselect.find("button").trigger("click");
+        await wrapper.vm.$nextTick();
+        await multiselect.find("input").setValue("new_tag");
+        await wrapper.vm.$nextTick();
+        multiselect.find(".multiselect-option").trigger("click");
+        await wrapper.vm.$nextTick();
+
+        expect(addLocalTagMock.mock.calls.length).toBe(1);
+        expect(addLocalTagMock.mock.results[0].value).toBe("new_tag");
+    });
+
+    it("warns about not allowed tags", async () => {
+        const wrapper = mountWithProps({
+            disabled: false,
+        });
+
+        const multiselect = wrapper.find(".multiselect");
+
+        multiselect.find("button").trigger("click");
+        await wrapper.vm.$nextTick();
+        await multiselect.find("input").setValue(":illegal_tag");
+        await wrapper.vm.$nextTick();
+
+        const option = multiselect.find(".multiselect-option");
+        expect(option.classes()).toContain("invalid");
+
+        option.trigger("click");
+        await wrapper.vm.$nextTick();
+
+        expect(warningMock.mock.calls.length).toBe(1);
+        expect(warningMock.mock.results[0].value.title).toBe("Invalid Tag");
+    });
+
+    it("hides too many tags", async () => {
+        const wrapper = mountWithProps({
+            value: ["tag_1", "tag_2", "tag_3", "tag_4", "tag_5", "tag_6"],
+            disabled: true,
+            useToggleLing: true,
+            maxVisibleTags: 4,
+        });
+
+        const tags = wrapper.findAll(".tag");
+        expect(tags.length).toBe(4);
+
+        const showMoreLink = wrapper.find(".toggle-link");
+        expect(showMoreLink.text()).toContain("2");
+    });
+});
diff --git a/client/src/components/TagsMultiselect/StatelessTags.vue b/client/src/components/TagsMultiselect/StatelessTags.vue
new file mode 100644
index 00000000000..11b6c7a5541
--- /dev/null
+++ b/client/src/components/TagsMultiselect/StatelessTags.vue
@@ -0,0 +1,357 @@
+<script setup lang="ts">
+import { ref, computed } from "vue";
+import Multiselect from "vue-multiselect";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { faTags, faCheck, faTimes, faPlus } from "@fortawesome/free-solid-svg-icons";
+import Tag from "./Tag.vue";
+import { useUserTags } from "@/composables/user";
+import { useToast } from "@/composables/toast";
+import { useUid } from "@/composables/utils/uid";
+
+import type { Ref } from "vue";
+
+interface StatelessTagsProps {
+    value?: string[];
+    disabled?: boolean;
+    clickable?: boolean;
+    useToggleLink?: boolean;
+    maxVisibleTags?: number;
+}
+
+const props = withDefaults(defineProps<StatelessTagsProps>(), {
+    value: () => [],
+    disabled: false,
+    clickable: false,
+    useToggleLink: true,
+    maxVisibleTags: 5,
+});
+
+const emit = defineEmits<{
+    (e: "input", tags: string[]): void;
+    (e: "tag-click", tag: string): void;
+}>();
+
+//@ts-ignore bad library types
+library.add(faTags, faCheck, faTimes, faPlus);
+
+const { userTags, addLocalTag } = useUserTags();
+const { warning } = useToast();
+
+function onAddTag(tag: string) {
+    const newTag = tag.trim();
+
+    if (isValid(newTag)) {
+        addLocalTag(newTag);
+        emit("input", [...props.value, newTag]);
+    } else {
+        warning(`"${newTag}" is not a valid tag.`, "Invalid Tag");
+    }
+}
+
+function onInput(val: string[]) {
+    emit("input", val);
+}
+
+function onDelete(tag: string) {
+    const val = [...tags.value];
+    const index = tags.value.indexOf(tag);
+    val.splice(index, 1);
+    emit("input", val);
+}
+
+const editing = ref(false);
+
+function onOpen() {
+    editing.value = true;
+}
+
+function onClose() {
+    editing.value = false;
+}
+
+const multiselectElement: Ref<Multiselect | null> = ref(null);
+
+function openMultiselect() {
+    //@ts-ignore bad library types
+    multiselectElement.value?.activate();
+}
+
+const tags = computed(() => props.value.map((tag) => tag.replace(/^name:/, "#")));
+
+const toggledOpen = ref(false);
+const toggleButtonId = useUid("toggle-link-");
+
+const trimmedTags = computed(() => {
+    if (!props.useToggleLink || toggledOpen.value) {
+        return tags.value;
+    } else {
+        return tags.value.slice(0, props.maxVisibleTags);
+    }
+});
+
+const slicedTags = computed(() => {
+    if (!props.useToggleLink) {
+        return [];
+    } else {
+        return tags.value.slice(props.maxVisibleTags);
+    }
+});
+
+const invalidTagRegex = /([.:\s][.:\s])|(^[.:])|([.:]$)|(^[\s]*$)/;
+
+function isValid(tag: string | { label: string }) {
+    if (typeof tag === "string") {
+        return !tag.match(invalidTagRegex);
+    } else {
+        return !tag.label.match(invalidTagRegex);
+    }
+}
+
+function onTagClicked(tag: string) {
+    emit("tag-click", tag);
+}
+</script>
+
+<template>
+    <div class="stateless-tags px-1">
+        <Multiselect
+            v-if="!disabled"
+            ref="multiselectElement"
+            placeholder="Add Tags"
+            open-direction="bottom"
+            :value="tags"
+            :options="userTags"
+            :multiple="true"
+            :taggable="true"
+            :close-on-select="false"
+            @tag="onAddTag"
+            @input="onInput"
+            @open="onOpen"
+            @close="onClose">
+            <template v-slot:tag="{ option, search }">
+                <Tag
+                    :option="option"
+                    :search="search"
+                    :editable="true"
+                    :clickable="props.clickable"
+                    @deleted="onDelete"
+                    @click="onTagClicked"></Tag>
+            </template>
+
+            <template v-slot:noOptions>
+                <span class="multiselect-option">Type to add new tag</span>
+            </template>
+
+            <template v-slot:caret>
+                <b-button v-if="!editing" class="toggle-button" variant="link" tabindex="-1" @click="openMultiselect">
+                    Add Tags
+                    <FontAwesomeIcon icon="fa-tags" />
+                </b-button>
+            </template>
+
+            <template v-slot:option="{ option }">
+                <span class="multiselect-option" :class="{ invalid: !isValid(option) }">
+                    <span>{{ option.label ?? option }}</span>
+                    <span v-if="tags.includes(option)" class="float-right">
+                        <span class="info">
+                            <FontAwesomeIcon class="check-icon" icon="fa-check" fixed-width />
+                        </span>
+
+                        <span class="info highlighted">
+                            <FontAwesomeIcon class="times-icon" icon="fa-times" fixed-width />
+                            <span class="sr-only">remove tag</span>
+                        </span>
+                    </span>
+                    <span v-else class="float-right">
+                        <span class="info highlighted">
+                            <FontAwesomeIcon class="plus-icon" icon="fa-plus" fixed-width />
+                            <span class="sr-only">add tag</span>
+                        </span>
+                    </span>
+                </span>
+            </template>
+        </Multiselect>
+
+        <div v-else class="pl-1 pb-2">
+            <div class="d-inline">
+                <Tag
+                    v-for="tag in trimmedTags"
+                    :key="tag"
+                    :option="tag"
+                    :editable="false"
+                    :clickable="props.clickable"
+                    @click="onTagClicked"></Tag>
+                <b-button
+                    v-if="slicedTags.length > 0 && !toggledOpen"
+                    :id="toggleButtonId"
+                    variant="link"
+                    class="toggle-link"
+                    @click="() => (toggledOpen = true)">
+                    {{ slicedTags.length }} more...
+                </b-button>
+
+                <b-tooltip
+                    v-if="slicedTags.length > 0 && !toggledOpen"
+                    :target="toggleButtonId"
+                    custom-class="stateless-tags--tag-preview-tooltip"
+                    placement="bottom">
+                    <Tag
+                        v-for="tag in slicedTags"
+                        :key="tag"
+                        :option="tag"
+                        :editable="false"
+                        :clickable="props.clickable"
+                        @click="onTagClicked"></Tag>
+                </b-tooltip>
+            </div>
+        </div>
+    </div>
+</template>
+
+<style lang="scss">
+.stateless-tags--tag-preview-tooltip {
+    opacity: 1 !important;
+}
+</style>
+
+<style lang="scss" scoped>
+@import "scss/theme/blue.scss";
+
+.stateless-tags {
+    .toggle-link {
+        padding: 0;
+        border: none;
+
+        &:hover {
+            background-color: transparent;
+            border: none;
+        }
+    }
+
+    &:deep(.multiselect) {
+        min-height: unset;
+        display: flex;
+        flex-direction: column-reverse;
+
+        .multiselect__select {
+            top: unset;
+            bottom: 0;
+            padding: 0 0.25rem;
+            z-index: 1;
+            height: $font-size-base * 2;
+
+            &::before {
+                border-color: $text-color transparent transparent;
+            }
+        }
+
+        .multiselect__placeholder {
+            display: none;
+        }
+
+        .multiselect__tags-wrap {
+            margin-bottom: 0.5rem;
+        }
+
+        .multiselect__tags {
+            padding: 0 0.25rem;
+            background: none;
+            font-size: $font-size-base;
+            border: none;
+            min-height: 0;
+        }
+
+        .multiselect__content-wrapper {
+            top: 100%;
+            z-index: 800;
+            width: calc(100% - 4px);
+            left: 2px;
+
+            box-shadow: 0 0 6px 0 rgba(3, 0, 34, 0.048), 0 0 4px 0 rgba(3, 0, 34, 0.185);
+        }
+
+        &.multiselect--above .multiselect__content-wrapper {
+            top: unset;
+        }
+
+        .multiselect__input,
+        .toggle-button {
+            font-size: $font-size-base;
+            color: $text-color;
+            text-decoration: none;
+            padding: 0;
+            background: none;
+            cursor: text;
+            text-align: left;
+            margin: 0;
+            border: none;
+        }
+
+        .multiselect__input {
+            padding-left: 0.25rem;
+        }
+
+        .toggle-button {
+            padding-left: 0.5rem;
+        }
+
+        // built in option class
+        .multiselect__option {
+            min-height: unset;
+            padding: 0;
+
+            &::after {
+                display: none;
+            }
+
+            // custom option wrapper
+            .multiselect-option {
+                font-size: $font-size-base;
+                padding: 0.5rem;
+                display: inline-block;
+                width: 100%;
+                height: 100%;
+
+                .info {
+                    display: none;
+                }
+
+                &.invalid {
+                    color: $brand-light;
+                    background-color: $brand-warning;
+                }
+            }
+        }
+
+        .multiselect__option--selected {
+            .multiselect-option {
+                color: $brand-primary;
+
+                .info:not(.highlighted) {
+                    display: inline-block;
+                }
+            }
+        }
+
+        .multiselect__option--highlight {
+            &::after {
+                display: none;
+            }
+
+            .multiselect-option {
+                background: $brand-primary;
+                color: $brand-light;
+
+                .info.highlighted {
+                    display: inline-block;
+                }
+
+                .info:not(.highlighted) {
+                    display: none;
+                }
+            }
+        }
+    }
+}
+</style>
diff --git a/client/src/components/TagsMultiselect/Tag.test.js b/client/src/components/TagsMultiselect/Tag.test.js
new file mode 100644
index 00000000000..bc507d45b20
--- /dev/null
+++ b/client/src/components/TagsMultiselect/Tag.test.js
@@ -0,0 +1,109 @@
+import { getLocalVue } from "tests/jest/helpers";
+import { mount } from "@vue/test-utils";
+import Tag from "./Tag";
+
+const localVue = getLocalVue();
+
+const mountWithProps = (props) => {
+    return mount(Tag, {
+        propsData: props,
+        localVue,
+    });
+};
+
+describe("Tag", () => {
+    it("displays it's option", () => {
+        {
+            const tag = mountWithProps({ option: "my_tag" });
+            expect(tag.text()).toBe("my_tag");
+        }
+
+        {
+            const tag = mountWithProps({ option: "a_longer_tag_name" });
+            expect(tag.text()).toBe("a_longer_tag_name");
+        }
+    });
+
+    it("shows it's clickable", async () => {
+        const tag = mountWithProps({ option: "my_tag" });
+
+        expect(tag.classes()).not.toContain("clickable");
+
+        tag.setProps({ clickable: true });
+        await tag.vm.$nextTick();
+
+        expect(tag.classes()).toContain("clickable");
+    });
+
+    it("can be clicked", async () => {
+        const tag = mountWithProps({ option: "my_tag", clickable: true });
+
+        expect(tag.classes()).toContain("clickable");
+
+        tag.trigger("click");
+        await tag.vm.$nextTick();
+
+        expect(tag.emitted().click).toBeTruthy();
+        expect(tag.emitted().click.length).toBe(1);
+        expect(tag.emitted().click[0]).toEqual(["my_tag"]);
+
+        tag.trigger("click");
+        await tag.vm.$nextTick();
+
+        expect(tag.emitted().click.length).toBe(2);
+        expect(tag.emitted().click).toStrictEqual([["my_tag"], ["my_tag"]]);
+    });
+
+    it("changes appearance when editable", async () => {
+        const tag = mountWithProps({ option: "my_tag" });
+
+        expect(tag.classes()).not.toContain("editable");
+        expect(tag.find(".tag-delete-button").exists()).not.toBe(true);
+
+        tag.setProps({ editable: true });
+        await tag.vm.$nextTick();
+
+        expect(tag.classes()).toContain("editable");
+        expect(tag.find(".tag-delete-button").exists()).toBe(true);
+    });
+
+    it("can be deleted", async () => {
+        const tag = mountWithProps({ option: "my_tag", editable: true });
+
+        expect(tag.find(".tag-delete-button").exists()).toBe(true);
+
+        tag.find(".tag-delete-button").trigger("click");
+        await tag.vm.$nextTick();
+
+        expect(tag.emitted().deleted).toBeTruthy();
+        expect(tag.emitted().deleted.length).toBe(1);
+        expect(tag.emitted().deleted[0]).toEqual(["my_tag"]);
+
+        expect(tag.emitted().click).toBeFalsy();
+    });
+
+    it("displays named tags bold", () => {
+        {
+            const wrapper = mountWithProps({ option: "my_tag" });
+            const span = wrapper.find(".tag span");
+            expect(span.classes()).not.toContain("font-weight-bold");
+        }
+
+        {
+            const wrapper = mountWithProps({ option: "#named_tag" });
+            const span = wrapper.find(".tag span");
+            expect(span.classes()).toContain("font-weight-bold");
+        }
+    });
+
+    it("highlights when searched", async () => {
+        const tag = mountWithProps({ option: "my_tag" });
+
+        expect(tag.classes()).not.toContain("searched");
+
+        tag.setProps({ search: "my_tag" });
+        await tag.vm.$nextTick();
+
+        expect(tag.classes()).toContain("searched");
+    });
+});
diff --git a/client/src/components/TagsMultiselect/Tag.vue b/client/src/components/TagsMultiselect/Tag.vue
new file mode 100644
index 00000000000..4a1d90f9020
--- /dev/null
+++ b/client/src/components/TagsMultiselect/Tag.vue
@@ -0,0 +1,112 @@
+<script setup lang="ts">
+import { computed } from "vue";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { faTimes } from "@fortawesome/free-solid-svg-icons";
+import { keyedColorScheme } from "@/utils/color";
+
+interface TagProps {
+    option: string;
+    search?: string;
+    editable?: boolean;
+    clickable?: boolean;
+}
+
+const props = defineProps<TagProps>();
+
+const emit = defineEmits<{
+    (e: "click", tag: string): void;
+    (e: "deleted", tag: string): void;
+}>();
+
+//@ts-ignore bad types
+library.add(faTimes);
+
+const color = computed(() => keyedColorScheme(props.option));
+
+function onClick() {
+    emit("click", props.option);
+}
+
+function onDelete() {
+    emit("deleted", props.option);
+}
+
+const named = computed(() => props.option?.startsWith("#"));
+const searched = computed(() => props.option?.toLowerCase() === props.search?.toLowerCase());
+</script>
+
+<template>
+    <div
+        class="tag btn-transparent-background"
+        :data-option="props.option"
+        :class="{ editable, clickable, searched }"
+        :style="`--color-primary: ${color.primary}; --color-darker: ${color.darker}; --color-dimmed: ${color.dimmed}`"
+        @click.prevent.stop="onClick">
+        <span :class="{ 'font-weight-bold': named }">
+            {{ props.option }}
+        </span>
+        <b-button
+            v-if="editable"
+            size="sm"
+            variant="link"
+            class="px-1 py-0 tag-delete-button"
+            tabindex="-1"
+            @click.prevent.stop="onDelete">
+            <FontAwesomeIcon icon="fa-times"></FontAwesomeIcon>
+        </b-button>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+@import "scss/theme/blue.scss";
+
+.tag {
+    display: inline-flex;
+    align-items: baseline;
+
+    margin-right: 0.25rem;
+    margin-bottom: 0.1rem;
+
+    font-size: $font-size-base * 0.95;
+    color: black;
+    border-radius: 4px;
+
+    background-color: var(--color-primary);
+    transition: background-color 0.1s;
+
+    padding: 0 0.5rem;
+    &.editable {
+        padding: 0 0.25rem;
+    }
+
+    position: relative;
+
+    &:before {
+        content: "";
+        width: 100%;
+        height: 100%;
+        top: 0;
+        left: 0;
+        position: absolute;
+        border-color: var(--color-darker);
+        border-radius: inherit;
+        pointer-events: none;
+
+        border-style: solid;
+        border-width: 0 2px 1px 0;
+    }
+
+    &.clickable {
+        cursor: pointer;
+
+        &:hover {
+            background-color: var(--color-dimmed);
+        }
+    }
+
+    &.searched {
+        outline: 2px solid $brand-danger;
+    }
+}
+</style>
diff --git a/client/src/components/Tool/Buttons/ToolFavoriteButton.vue b/client/src/components/Tool/Buttons/ToolFavoriteButton.vue
index e2f88cad847..c5f7ecfcb83 100644
--- a/client/src/components/Tool/Buttons/ToolFavoriteButton.vue
+++ b/client/src/components/Tool/Buttons/ToolFavoriteButton.vue
@@ -12,10 +12,10 @@ const props = defineProps({
 
 const emit = defineEmits(["onSetError", "onUpdateFavorites"]);
 
-const { currentUser: user, addFavoriteTool, removeFavoriteTool } = useCurrentUser();
+const { currentUser: user, currentFavorites, addFavoriteTool, removeFavoriteTool } = useCurrentUser();
 
 const hasUser = computed(() => !user.value.isAnonymous);
-const isFavorite = computed(() => getFavorites().tools.includes(props.id));
+const isFavorite = computed(() => currentFavorites.value.tools.includes(props.id));
 const showAddFavorite = computed(() => hasUser.value && !isFavorite.value);
 const showRemoveFavorite = computed(() => hasUser.value && isFavorite.value);
 
@@ -58,16 +58,6 @@ async function onRemoveFavorite() {
         ariaAlert("failed to remove from favorites");
     }
 }
-
-function getFavorites() {
-    const preferences = user.value.preferences;
-
-    if (preferences?.favorites) {
-        return JSON.parse(preferences.favorites);
-    } else {
-        return { tools: [] };
-    }
-}
 </script>
 
 <script>
diff --git a/client/src/components/Tool/ToolCard.test.js b/client/src/components/Tool/ToolCard.test.js
index 14a95e2932e..0ec1a66f60f 100644
--- a/client/src/components/Tool/ToolCard.test.js
+++ b/client/src/components/Tool/ToolCard.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue, mockModule } from "jest/helpers";
+import { getLocalVue, mockModule } from "tests/jest/helpers";
 import ToolCard from "./ToolCard";
 import Vuex from "vuex";
 import { userStore } from "store/userStore";
@@ -39,8 +39,7 @@ describe("ToolCard", () => {
                     versions: [],
                     sharable_url: "options.sharable_url",
                     help: "options.help",
-                    citations: null,
-                    hasCitations: false,
+                    citations: false,
                 },
                 messageText: "messageText",
                 messageVariant: "warning",
diff --git a/client/src/components/Tool/ToolCard.vue b/client/src/components/Tool/ToolCard.vue
index a9ae1a5ce1a..9e584cd06d6 100644
--- a/client/src/components/Tool/ToolCard.vue
+++ b/client/src/components/Tool/ToolCard.vue
@@ -121,7 +121,7 @@ const showVersions = computed(() => props.options.versions?.length > 1);
 
             <ToolFooter
                 :id="props.id"
-                :has-citations="props.options.hasCitations"
+                :has-citations="props.options.citations"
                 :xrefs="props.options.xrefs"
                 :license="props.options.license"
                 :creators="props.options.creators"
diff --git a/client/src/components/Tool/ToolFooter.test.js b/client/src/components/Tool/ToolFooter.test.js
index 3df102eb986..201795faf7f 100644
--- a/client/src/components/Tool/ToolFooter.test.js
+++ b/client/src/components/Tool/ToolFooter.test.js
@@ -1,7 +1,7 @@
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import flushPromises from "flush-promises";
 import ToolFooter from "./ToolFooter";
 
diff --git a/client/src/components/Tool/ToolFooter.vue b/client/src/components/Tool/ToolFooter.vue
index 451e31908c0..452af96fd1c 100644
--- a/client/src/components/Tool/ToolFooter.vue
+++ b/client/src/components/Tool/ToolFooter.vue
@@ -2,12 +2,15 @@
     <b-card v-if="hasContent" class="tool-footer">
         <div v-if="hasCitations" class="mb-1">
             <span v-localize class="footer-section-name">Citations</span>
-            <font-awesome-icon
+            <b-button
                 v-b-tooltip.hover
                 title="Copy all citations as BibTeX"
-                icon="copy"
                 style="cursor: pointer"
-                @click="copyBibtex" />
+                variant="link"
+                size="sm"
+                @click="copyBibtex">
+                <font-awesome-icon icon="copy" />
+            </b-button>
             <Citation
                 v-for="(citation, index) in citations"
                 :key="index"
@@ -17,8 +20,12 @@
         </div>
         <div v-if="hasRequirements" class="mb-1">
             <span v-localize class="footer-section-name">Requirements</span>
-            <a href="https://galaxyproject.org/tools/requirements/" target="_blank">
-                <font-awesome-icon v-b-tooltip.hover title="Learn more about Galaxy Requirements" icon="question" />
+            <a
+                v-b-tooltip.hover
+                title="Learn more about Galaxy Requirements"
+                href="https://galaxyproject.org/tools/requirements/"
+                target="_blank">
+                See details <font-awesome-icon icon="external-link-alt" />
             </a>
             <div v-for="(requirement, index) in requirements" :key="index">
                 - {{ requirement.name }}
@@ -90,7 +97,7 @@ export default {
         },
         hasCitations: {
             type: Boolean,
-            default: true,
+            default: false,
         },
         xrefs: {
             type: Array,
diff --git a/client/src/components/Tool/ToolForm.test.js b/client/src/components/Tool/ToolForm.test.js
index f95557ecd42..5f00316645d 100644
--- a/client/src/components/Tool/ToolForm.test.js
+++ b/client/src/components/Tool/ToolForm.test.js
@@ -1,17 +1,19 @@
 import MockAdapter from "axios-mock-adapter";
 import axios from "axios";
 import { mount } from "@vue/test-utils";
-import { getLocalVue, mockModule } from "jest/helpers";
+import { getLocalVue, mockModule } from "tests/jest/helpers";
 import ToolForm from "./ToolForm";
 import MockCurrentUser from "../providers/MockCurrentUser";
 import MockConfigProvider from "../providers/MockConfigProvider";
 import MockCurrentHistory from "components/providers/MockCurrentHistory";
 import Vue from "vue";
 import Vuex from "vuex";
+import { createPinia } from "pinia";
 import { userStore } from "store/userStore";
 import { configStore } from "store/configStore";
 
 const localVue = getLocalVue();
+const pinia = createPinia();
 
 describe("ToolForm", () => {
     let wrapper;
@@ -52,6 +54,7 @@ describe("ToolForm", () => {
                 FormDisplay: true,
             },
             provide: { store },
+            pinia,
         });
     });
 
diff --git a/client/src/components/Tool/ToolForm.vue b/client/src/components/Tool/ToolForm.vue
index 020e3f318a1..2dc15868beb 100644
--- a/client/src/components/Tool/ToolForm.vue
+++ b/client/src/components/Tool/ToolForm.vue
@@ -107,6 +107,8 @@
 
 <script>
 import { getGalaxyInstance } from "app";
+import { useHistoryItemsStore } from "stores/history/historyItemsStore";
+import { mapState } from "pinia";
 import { getToolFormData, updateToolFormData, submitJob } from "./services";
 import { allowCachedJobs } from "./utilities";
 import { refreshContentsWrapper } from "utils/data";
@@ -189,6 +191,7 @@ export default {
         };
     },
     computed: {
+        ...mapState(useHistoryItemsStore, ["getLatestCreateTime"]),
         toolName() {
             return this.formConfig.name;
         },
@@ -219,21 +222,19 @@ export default {
             }
         },
     },
-    created() {
-        this.requestTool().then(() => {
+    watch: {
+        getLatestCreateTime() {
             const Galaxy = getGalaxyInstance();
             if (Galaxy && Galaxy.currHistoryPanel) {
-                console.debug(`ToolForm::created - Started listening to history changes. [${this.id}]`);
-                Galaxy.currHistoryPanel.collection.on("change", this.onHistoryChange, this);
+                console.debug("History change watcher detected a change.");
+                this.onHistoryChange();
             }
-        });
+        },
     },
-    beforeDestroy() {
-        const Galaxy = getGalaxyInstance();
-        if (Galaxy && Galaxy.currHistoryPanel) {
-            Galaxy.currHistoryPanel.collection.off("change", this.onHistoryChange, this);
-            console.debug(`ToolForm::beforeDestroy - Stopped listening to history changes. [${this.id}]`);
-        }
+    created() {
+        this.requestTool().then(() => {
+            console.debug(`ToolForm::created - Started listening to history changes. [${this.id}]`);
+        });
     },
     methods: {
         emailAllowed(config, user) {
diff --git a/client/src/components/Tool/ToolHelp.test.js b/client/src/components/Tool/ToolHelp.test.js
index 2d9b4dd1725..509561e3856 100644
--- a/client/src/components/Tool/ToolHelp.test.js
+++ b/client/src/components/Tool/ToolHelp.test.js
@@ -1,4 +1,4 @@
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import ToolHelp from "./ToolHelp";
 import { mount } from "@vue/test-utils";
 
diff --git a/client/src/components/Tool/ToolHelp.vue b/client/src/components/Tool/ToolHelp.vue
index b75800002bd..88420b8b2ee 100644
--- a/client/src/components/Tool/ToolHelp.vue
+++ b/client/src/components/Tool/ToolHelp.vue
@@ -1,6 +1,5 @@
 <script setup>
-import { computed } from "vue";
-import { getAppRoot } from "onload/loadConfig";
+import { useFormattedToolHelp } from "composables/formattedToolHelp";
 
 const props = defineProps({
     content: {
@@ -9,57 +8,7 @@ const props = defineProps({
     },
 });
 
-const formattedContent = computed(() => {
-    const node = document.createElement("div");
-    node.innerHTML = props.content;
-
-    const links = node.getElementsByTagName("a");
-    Array.from(links).forEach((link) => {
-        link.target = "_blank";
-    });
-
-    const images = node.getElementsByTagName("img");
-    Array.from(images).forEach((image) => {
-        if (image.src.includes("admin_toolshed")) {
-            image.src = getAppRoot() + image.src;
-        }
-    });
-
-    // loop these levels backwards to avoid increasing heading twice
-    [5, 4, 3, 2, 1].forEach((level) => {
-        increaseHeadingLevel(node, level, 2);
-    });
-
-    return node.innerHTML;
-});
-
-/**
- * @param {HTMLElement} node
- * @param {number} level
- * @param {number} increaseBy
- */
-function increaseHeadingLevel(node, level, increaseBy) {
-    // cap target level at 6 (highest heading level)
-    let targetLevel = level + increaseBy;
-    if (targetLevel > 6) {
-        targetLevel = 6;
-    }
-
-    const headings = node.getElementsByTagName(`h${level}`);
-
-    // create new headings with target level and copy contents + attributes
-    Array.from(headings).forEach((heading) => {
-        const newTag = document.createElement(`h${targetLevel}`);
-        newTag.innerHTML = heading.innerHTML;
-
-        Array.from(heading.attributes).forEach((attribute) => {
-            newTag.setAttribute(attribute.name, attribute.value);
-        });
-
-        heading.insertAdjacentElement("beforebegin", newTag);
-        heading.remove();
-    });
-}
+const { formattedContent } = useFormattedToolHelp(props.content);
 </script>
 
 <template>
diff --git a/client/src/components/ToolEntryPoints/ToolEntryPoints.test.js b/client/src/components/ToolEntryPoints/ToolEntryPoints.test.js
new file mode 100644
index 00000000000..c1cddb4341f
--- /dev/null
+++ b/client/src/components/ToolEntryPoints/ToolEntryPoints.test.js
@@ -0,0 +1,88 @@
+import { createTestingPinia } from "@pinia/testing";
+import { setActivePinia, PiniaVuePlugin } from "pinia";
+import { mount } from "@vue/test-utils";
+import ToolEntryPoints from "./ToolEntryPoints";
+import { getLocalVue } from "tests/jest/helpers";
+
+describe("ToolEntryPoints/ToolEntryPoints.vue", () => {
+    const localVue = getLocalVue();
+    localVue.use(PiniaVuePlugin);
+    const INACTIVE_ITS = [
+        {
+            model_class: "InteractiveToolEntryPoint",
+            id: "52e496b945151ee8",
+            job_id: "52e496b945151ee8",
+            name: "Jupyter Interactive Tool",
+            active: false,
+            created_time: "2020-02-24T15:59:18.122103",
+            modified_time: "2020-02-24T15:59:20.428594",
+            target: "http://52e496b945151ee8-be8a5bee5d5849a5b4e035b51305256e.interactivetoolentrypoint.interactivetool.localhost:8080/ipython/lab",
+        },
+        {
+            model_class: "InteractiveToolEntryPoint",
+            id: "b887d74393f85b6d",
+            job_id: "52e496b945151ee8",
+            name: "AskOmics instance on None",
+            active: false,
+            created_time: "2020-01-24T15:59:22.406480",
+            modified_time: "2020-02-24T15:59:24.757453",
+            target: "http://b887d74393f85b6d-b1fd3f42331a49c1b3d8a4d1b27240b8.interactivetoolentrypoint.interactivetool.localhost:8080/loginapikey/oleg",
+        },
+        {
+            model_class: "InteractiveToolEntryPoint",
+            id: "b887d74393f85b6d",
+            job_id: "b887d74393f85b6d",
+            name: "AskOmics instance on None",
+            active: true,
+            created_time: "2020-01-24T15:59:22.406480",
+            modified_time: "2020-02-24T15:59:24.757453",
+            target: "http://b887d74393f85b6d-b1fd3f42331a49c1b3d8a4d1b27240b8.interactivetoolentrypoint.interactivetool.localhost:8080/loginapikey/oleg",
+        },
+    ];
+    const ACTIVE_ITS = INACTIVE_ITS.map((obj, i) => {
+        return { ...obj, active: true };
+    });
+    let wrapper;
+    let testPinia;
+
+    it("should render list when result are ready but views are not active yet", async () => {
+        testPinia = createTestingPinia({
+            initialState: {
+                entryPointStore: {
+                    entryPoints: INACTIVE_ITS,
+                },
+            },
+        });
+        setActivePinia(testPinia);
+        wrapper = mount(ToolEntryPoints, {
+            propsData: {
+                jobId: "52e496b945151ee8",
+            },
+            localVue,
+            pinia: testPinia,
+        });
+        const listItems = wrapper.findAll("li");
+        expect(listItems.length).toBe(2);
+        expect(wrapper.find("span>a").exists() === false).toBeTruthy();
+    });
+
+    it("should render links when tools are active", async () => {
+        testPinia = createTestingPinia({
+            initialState: {
+                entryPointStore: {
+                    entryPoints: ACTIVE_ITS,
+                },
+            },
+        });
+        setActivePinia(testPinia);
+        wrapper = mount(ToolEntryPoints, {
+            propsData: {
+                jobId: "52e496b945151ee8",
+            },
+            localVue,
+            pinia: testPinia,
+        });
+        const links = wrapper.findAll("span>a");
+        expect(links.length).toBe(2);
+    });
+});
diff --git a/client/src/components/ToolEntryPoints/ToolEntryPoints.vue b/client/src/components/ToolEntryPoints/ToolEntryPoints.vue
index 1d7b07c07f3..2d41240e0f9 100644
--- a/client/src/components/ToolEntryPoints/ToolEntryPoints.vue
+++ b/client/src/components/ToolEntryPoints/ToolEntryPoints.vue
@@ -1,10 +1,15 @@
 <template>
     <div class="infomessagelarge">
-        <p v-if="entryPoints.length == 0">Waiting for InteractiveTool result view(s) to become available.</p>
-        <p v-else-if="entryPoints.length == 1">
-            <span v-if="entryPoints[0].active">
+        <p v-if="entryPointsForJob(jobId).length == 0">
+            Waiting for InteractiveTool result view(s) to become available.
+        </p>
+        <p v-else-if="entryPointsForJob(jobId).length == 1">
+            <span v-if="entryPointsForJob(jobId)[0].active">
                 There is an InteractiveTool result view available,
-                <a :href="entryPoints[0].target">click here to display</a>.
+                <a v-b-tooltip title="Open Interactive Tool" :href="entryPointsForJob(jobId)[0].target" target="_blank">
+                    Open
+                    <font-awesome-icon icon="external-link-alt" />
+                </a>
             </span>
             <span v-else>
                 There is an InteractiveTool result view available, waiting for view to become active...
@@ -13,9 +18,14 @@
         <div v-else>
             There are multiple InteractiveTool result views available:
             <ul>
-                <li v-for="entryPoint of entryPoints" :key="entryPoint.id">
+                <li v-for="entryPoint of entryPointsForJob(jobId)" :key="entryPoint.id">
                     {{ entryPoint.name }}
-                    <span v-if="entryPoint.active"> (<a :href="entryPoint.target">click here to display</a>) </span>
+                    <span v-if="entryPoint.active">
+                        <a v-b-tooltip title="Open Interactive Tool" :href="entryPoint.target" target="_blank">
+                            (Open
+                            <font-awesome-icon icon="external-link-alt" />)
+                        </a>
+                    </span>
                     <span v-else> (waiting to become active...) </span>
                 </li>
             </ul>
@@ -27,42 +37,36 @@
 </template>
 
 <script>
-import { clearPolling, pollUntilActive } from "./poll";
+import { mapActions, mapState } from "pinia";
+import { useEntryPointStore } from "stores/entryPointStore";
 import { getAppRoot } from "onload/loadConfig";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { faExternalLinkAlt } from "@fortawesome/free-solid-svg-icons";
+
+library.add(faExternalLinkAlt);
 
 export default {
+    components: {
+        FontAwesomeIcon,
+    },
     props: {
         jobId: {
             type: String,
             required: true,
         },
     },
-    data() {
-        return {
-            entryPoints: [],
-        };
-    },
     computed: {
+        ...mapState(useEntryPointStore, ["entryPointsForJob"]),
         interactiveToolsLink: function () {
             return getAppRoot() + "interactivetool_entry_points/list";
         },
     },
     created: function () {
-        this.pollEntryPoints();
-    },
-    beforeDestroy: function () {
-        clearPolling();
+        this.ensurePollingEntryPoints();
     },
     methods: {
-        pollEntryPoints: function () {
-            const onUpdate = (entryPoints) => {
-                this.entryPoints = entryPoints;
-            };
-            const onError = (e) => {
-                console.error(e);
-            };
-            pollUntilActive(onUpdate, onError, { job_id: this.jobId });
-        },
+        ...mapActions(useEntryPointStore, ["ensurePollingEntryPoints"]),
     },
 };
 </script>
diff --git a/client/src/components/ToolEntryPoints/poll.js b/client/src/components/ToolEntryPoints/poll.js
deleted file mode 100644
index b21051f136a..00000000000
--- a/client/src/components/ToolEntryPoints/poll.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import axios from "axios";
-import { getAppRoot } from "onload/loadConfig";
-
-let interval;
-
-export const clearPolling = () => {
-    clearInterval(interval);
-};
-
-export const pollUntilActive = (onUpdate, onError, params) => {
-    clearPolling();
-    const url = getAppRoot() + `api/entry_points`;
-    axios
-        .get(url, { params: params })
-        .then((response) => {
-            const entryPoints = [];
-            let allReady = true;
-            response.data.forEach((entryPoint, i) => {
-                entryPoints.push(entryPoint);
-                if (!entryPoint.active) {
-                    allReady = false;
-                }
-            });
-            onUpdate(entryPoints);
-            if (!allReady || entryPoints.length == 0) {
-                interval = setInterval(() => {
-                    pollUntilActive(onUpdate, onError, params);
-                }, 3000);
-            }
-        })
-        .catch(onError);
-};
diff --git a/client/src/components/ToolRecommendation.vue b/client/src/components/ToolRecommendation.vue
index f268ba82dff..5dac7555378 100644
--- a/client/src/components/ToolRecommendation.vue
+++ b/client/src/components/ToolRecommendation.vue
@@ -95,7 +95,7 @@ export default {
             svgElem.setAttribute("viewBox", -translateX + " 0 " + 0.5 * clientW + " " + clientH);
             svgElem.setAttribute("preserveAspectRatio", "xMidYMid meet");
 
-            const tree = d3.layout.tree().size([clientH, clientW]);
+            const tree = d3.tree().size([clientH, clientW]);
             const diagonal = d3.svg.diagonal().projection((d) => {
                 return [d.y, d.x];
             });
diff --git a/client/src/components/ToolsList/ScrollToTopButton.vue b/client/src/components/ToolsList/ScrollToTopButton.vue
index c28d59bd022..2a78772bade 100644
--- a/client/src/components/ToolsList/ScrollToTopButton.vue
+++ b/client/src/components/ToolsList/ScrollToTopButton.vue
@@ -1,17 +1,24 @@
 <template>
     <b-button
-        v-if="offset > 200"
         v-b-tooltip.noninteractive.hover
-        class="ui-btn-back-to-top btn-circle"
+        class="back-to-top"
+        :class="{ show: offset > 100 }"
         title="Scroll To Top"
         variant="info"
         @click="$emit('click')">
-        <i class="fa fa-arrow-up" />
+        <FontAwesomeIcon icon="fa-chevron-up" />
     </b-button>
 </template>
 
 <script>
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { faChevronUp } from "@fortawesome/free-solid-svg-icons";
+
+library.add(faChevronUp);
+
 export default {
+    components: { FontAwesomeIcon },
     props: {
         offset: {
             type: Number,
@@ -20,3 +27,17 @@ export default {
     },
 };
 </script>
+
+<style lang="scss" scoped>
+.back-to-top {
+    bottom: 0.5rem;
+    left: 0.5rem;
+    position: absolute;
+    opacity: 0;
+    transition: opacity 0.4s;
+
+    &.show {
+        opacity: 1;
+    }
+}
+</style>
diff --git a/client/src/components/ToolsList/ToolsList.vue b/client/src/components/ToolsList/ToolsList.vue
index 20f05f4c5c3..dcde1da0be0 100644
--- a/client/src/components/ToolsList/ToolsList.vue
+++ b/client/src/components/ToolsList/ToolsList.vue
@@ -4,36 +4,34 @@
         :filter-settings="filterSettings"
         :toolbox="toolbox"
         :panel-view="panelView">
-        <section class="overflow-auto h-100" @scroll="onScroll">
+        <section class="tools-list">
             <div class="mb-2">
-                <span class="row mb-2">
-                    <span class="col">
-                        <h1 v-if="hasFilters" class="d-inline-block h-lg">Advanced Tool Search Results</h1>
-                        <h1 v-else class="d-inline-block h-lg">
-                            Consolidated view of {{ itemsLoaded.length }} available tools.
-                        </h1>
-                    </span>
-                </span>
+                <h1 class="h-lg">Search Results</h1>
                 <span v-if="itemsLoaded.length !== 0" class="row">
-                    <span v-if="hasFilters" class="col d-inline-block">
+                    <span v-if="filterCount" class="col d-inline-block d-flex align-items-baseline flex-gapx-1">
                         Found {{ itemsLoaded.length }} tools for
-                        <a id="popover-filters" href="javascript:void(0)">filters</a>.
-                        <b-popover target="popover-filters" triggers="hover" placement="top">
+                        <b-button id="popover-filters" class="ui-link">
+                            {{ filterCount }}
+                            {{ filterCount === 1 ? "filter" : "filters" }}.
+                        </b-button>
+                        <b-popover target="popover-filters" triggers="hover focus" placement="bottom">
                             <template v-slot:title>Filters</template>
                             <div v-for="(value, filter) in filterSettings" :key="filter">
                                 <b>{{ filter }}</b
                                 >: {{ value }}
                             </div>
                         </b-popover>
-                        Click <a href="javascript:void(0)" @click.stop="showAllTools">here</a> for a consolidated view
-                        of all tools in this Galaxy instance.
+                        <b-button variant="link" size="sm" @click.stop="showAllTools">
+                            <FontAwesomeIcon icon="fa-times" />
+                            Clear filters
+                        </b-button>
                     </span>
                     <span v-else class="col d-inline-block">
-                        No filters applied. Please add filters to the menu in the Tool Panel.
+                        No filters applied. Please add filters to the Advanced Tool Search in the Tool Panel.
                     </span>
                 </span>
             </div>
-            <div>
+            <div ref="scrollContainer" class="overflow-auto">
                 <b-alert v-if="loading" class="m-2" variant="info" show>
                     <LoadingSpan message="Loading Advanced Search Results" />
                 </b-alert>
@@ -44,7 +42,7 @@
                     <ToolsListTable :tools="itemsLoaded" />
                 </div>
             </div>
-            <ScrollToTopButton :offset="offset" @click="scrollToTop" />
+            <ScrollToTopButton :offset="scrollTop" @click="scrollToTop" />
         </section>
     </ToolsProvider>
 </template>
@@ -54,6 +52,13 @@ import LoadingSpan from "components/LoadingSpan";
 import { ToolsProvider } from "components/providers/storeProviders";
 import ToolsListTable from "./ToolsListTable";
 import ScrollToTopButton from "./ScrollToTopButton";
+import { useAnimationFrameScroll } from "composables/sensors/animationFrameScroll";
+import { ref } from "vue";
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { library } from "@fortawesome/fontawesome-svg-core";
+import { faTimes } from "@fortawesome/free-solid-svg-icons";
+
+library.add(faTimes);
 
 export default {
     components: {
@@ -61,6 +66,7 @@ export default {
         ToolsListTable,
         ToolsProvider,
         ScrollToTopButton,
+        FontAwesomeIcon,
     },
     props: {
         name: {
@@ -80,9 +86,13 @@ export default {
             default: "",
         },
     },
-    data() {
+    setup() {
+        const scrollContainer = ref(null);
+        const { scrollTop } = useAnimationFrameScroll(scrollContainer);
+
         return {
-            offset: 0,
+            scrollContainer,
+            scrollTop,
         };
     },
     computed: {
@@ -101,16 +111,13 @@ export default {
             });
             return newFilterSettings;
         },
-        hasFilters() {
+        filterCount() {
             return Object.keys(this.filterSettings).length;
         },
     },
     methods: {
-        onScroll(e) {
-            this.offset = e.target.scrollTop;
-        },
         scrollToTop() {
-            this.$el.scrollTop = 0;
+            this.$refs.scrollContainer.scrollTo({ top: 0, behavior: "smooth" });
         },
         showAllTools() {
             this.$router.push({ path: "/tools/list" });
@@ -118,3 +125,12 @@ export default {
     },
 };
 </script>
+
+<style lang="scss" scoped>
+.tools-list {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+}
+</style>
diff --git a/client/src/components/ToolsList/ToolsListItem.vue b/client/src/components/ToolsList/ToolsListItem.vue
new file mode 100644
index 00000000000..874ab63bc33
--- /dev/null
+++ b/client/src/components/ToolsList/ToolsListItem.vue
@@ -0,0 +1,136 @@
+<script setup>
+import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import { ref, computed } from "vue";
+import { useFormattedToolHelp } from "composables/formattedToolHelp";
+import ToolFavoriteButton from "components/Tool/Buttons/ToolFavoriteButton";
+const props = defineProps({
+    id: { type: String, required: true },
+    name: { type: String, required: true },
+    section: { type: String, required: true },
+    description: { type: String, default: null },
+    summary: { type: String, default: null },
+    help: { type: String, default: null },
+    version: { type: String, default: null },
+    link: { type: String, default: null },
+    workflowCompatible: { type: Boolean, default: false },
+    local: { type: Boolean, default: false },
+});
+
+const emit = defineEmits(["open"]);
+
+const showHelp = ref(false);
+
+const formattedToolHelp = computed(() => {
+    if (showHelp.value) {
+        const { formattedContent } = useFormattedToolHelp(props.help);
+        return formattedContent.value;
+    } else {
+        return "";
+    }
+});
+</script>
+
+<script>
+import { library } from "@fortawesome/fontawesome-svg-core";
+import {
+    faWrench,
+    faGlobe,
+    faCheck,
+    faTimes,
+    faAngleDown,
+    faAngleUp,
+    faExclamationTriangle,
+} from "@fortawesome/free-solid-svg-icons";
+
+library.add(faWrench, faGlobe, faCheck, faTimes, faAngleDown, faAngleUp, faExclamationTriangle);
+</script>
+
+<template>
+    <div class="tool-list-item ui-portlet-section">
+        <div class="top-bar bg-secondary px-2 py-1 rounded-right">
+            <div class="py-1 d-flex flex-wrap flex-gapx-1">
+                <span>
+                    <FontAwesomeIcon v-if="props.local" icon="fa-wrench" fixed-width />
+                    <FontAwesomeIcon v-else icon="fa-globe" fixed-width />
+
+                    <b-button v-if="props.local" class="ui-link text-dark" @click="() => emit('open')">
+                        <b>{{ props.name }}</b>
+                    </b-button>
+                    <b-button v-else class="ui-link text-dark" :href="props.link">
+                        <b>{{ props.name }}</b>
+                    </b-button>
+                </span>
+                <span itemprop="description">{{ props.description }}</span>
+                <span>(Galaxy Version {{ props.version }})</span>
+            </div>
+            <div>
+                <ToolFavoriteButton :id="props.id" />
+
+                <b-button v-if="props.local" variant="primary" size="sm" @click="() => emit('open')">
+                    <FontAwesomeIcon icon="fa-wrench" fixed-width />
+                    Open
+                </b-button>
+                <b-button v-else variant="primary" size="sm" :href="props.link">
+                    <FontAwesomeIcon icon="fa-globe" fixed-width />
+                    Open
+                </b-button>
+            </div>
+        </div>
+
+        <div class="portlet-content">
+            <div class="d-flex flex-gapx-1 py-2">
+                <span v-if="props.section" class="info px-1 rounded">
+                    <b>Section:</b> <b-link :to="`/tools/list?section=${props.section}`">{{ section }}</b-link>
+                </span>
+
+                <span v-if="!props.local" class="info px-1 rounded">
+                    <FontAwesomeIcon icon="fa-globe" fixed-width />
+                    External
+                </span>
+
+                <span v-if="!props.workflowCompatible" class="warn px-1 rounded">
+                    <FontAwesomeIcon icon="fa-exclamation-triangle" />
+                    Not Workflow compatible
+                </span>
+            </div>
+
+            <div v-if="props.summary" v-html="props.summary"></div>
+
+            <div v-if="props.help" class="mt-2">
+                <b-button v-if="!showHelp" class="ui-link" @click="() => (showHelp = true)">
+                    <FontAwesomeIcon icon="fa-angle-down" />
+                    Show tool help
+                </b-button>
+                <b-button v-else class="ui-link" @click="() => (showHelp = false)">
+                    <FontAwesomeIcon icon="fa-angle-up" />
+                    Hide tool help
+                </b-button>
+
+                <div v-if="showHelp" class="mt-2" v-html="formattedToolHelp"></div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+@import "theme/blue.scss";
+
+.tool-list-item {
+    .info {
+        background-color: scale-color($brand-info, $lightness: +75%);
+    }
+
+    .success {
+        background-color: scale-color($brand-success, $lightness: +75%);
+    }
+
+    .warn {
+        background-color: scale-color($brand-warning, $lightness: +75%);
+    }
+
+    .top-bar {
+        display: flex;
+        justify-content: space-between;
+    }
+}
+</style>
diff --git a/client/src/components/ToolsList/ToolsListTable.vue b/client/src/components/ToolsList/ToolsListTable.vue
index f92c94184cd..80ed264f827 100644
--- a/client/src/components/ToolsList/ToolsListTable.vue
+++ b/client/src/components/ToolsList/ToolsListTable.vue
@@ -1,59 +1,25 @@
 <template>
-    <div v-infinite-scroll="loadTools" infinite-scroll-disabled="busy">
-        <b-table striped bordered :fields="fields" :items="buffer">
-            <template v-slot:cell(name)="row">
-                <span v-if="!row.item.help">
-                    <b>{{ row.item.name }}</b> {{ row.item.description }}
-                </span>
-                <span v-else>
-                    <b-link href="javascript:void(0)" role="button" @click.stop="row.toggleDetails()">
-                        <b>{{ row.item.name }}</b> {{ row.item.description }}
-                    </b-link>
-                    <p v-if="!row.item._showDetails && row.item.summary" v-html="row.item.summary" />
-                </span>
-            </template>
-            <template v-slot:row-details="row">
-                <b-card v-if="row.item.help">
-                    <p class="mb-1" v-html="row.item.help" />
-                    <a
-                        :href="row.item.target === 'galaxy_main' ? 'javascript:void(0)' : row.item.link"
-                        @click.stop="onOpen(row.item)">
-                        Click here to open the tool
-                    </a>
-                </b-card>
-            </template>
-            <template v-slot:cell(section)="row">
-                {{ row.item.panel_section_name }}
-            </template>
-            <template v-slot:cell(workflow)="row">
-                <span
-                    v-if="row.item.is_workflow_compatible"
-                    v-b-tooltip.hover
-                    class="fa fa-check text-success"
-                    title="Is Workflow Compatible" />
-                <span v-else v-b-tooltip.hover class="fa fa-times text-danger" title="Not Workflow Compatible" />
-            </template>
-            <template v-slot:cell(target)="row">
-                <span
-                    v-if="row.item.target === 'galaxy_main'"
-                    v-b-tooltip.hover
-                    class="fa fa-check text-success"
-                    title="Is Local" />
-                <span v-else v-b-tooltip.hover class="fa fa-times text-danger" title="Not Local" />
-            </template>
-            <template v-slot:cell(open)="row">
-                <b-button
-                    v-b-tooltip.hover.top
-                    :title="'Open Tool' | localize"
-                    class="fa fa-play"
-                    size="sm"
-                    variant="primary"
-                    :href="row.item.target === 'galaxy_main' ? 'javascript:void(0)' : row.item.link"
-                    @click.stop="onOpen(row.item)" />
-            </template>
-        </b-table>
+    <div
+        v-infinite-scroll="loadTools"
+        class="tools-list-table"
+        infinite-scroll-distance="200"
+        infinite-scroll-disabled="busy">
+        <ToolsListItem
+            v-for="item of buffer"
+            :id="item.id"
+            :key="item.id"
+            :name="item.name"
+            :section="item.panel_section_name"
+            :description="item.description"
+            :summary="item.summary"
+            :help="item.help"
+            :local="item.target === 'galaxy_main'"
+            :link="item.link"
+            :workflow-compatible="item.is_workflow_compatible"
+            :version="item.version"
+            @open="() => onOpen(item)" />
         <div>
-            <i v-if="allLoaded">All {{ tools.length > 1 ? tools.length : "" }} results loaded</i>
+            <div v-if="allLoaded" class="list-end my-2">- End of search results -</div>
             <b-overlay :show="busy" opacity="0.5" />
         </div>
     </div>
@@ -61,15 +27,16 @@
 
 <script>
 import Vue from "vue";
-import _l from "utils/localization";
 import infiniteScroll from "vue-infinite-scroll";
-import { openGlobalUploadModal } from "components/Upload";
+import { useGlobalUploadModal } from "composables/globalUploadModal";
 import { fetchData } from "./services";
+import ToolsListItem from "./ToolsListItem";
 
 const defaultBufferLen = 4;
 const loadTimeout = 100;
 
 export default {
+    components: { ToolsListItem },
     directives: { infiniteScroll },
     props: {
         tools: {
@@ -77,37 +44,15 @@ export default {
             default: null,
         },
     },
+    setup() {
+        const { openGlobalUploadModal } = useGlobalUploadModal();
+        return { openGlobalUploadModal };
+    },
     data() {
         return {
             allLoaded: false,
             bufferLen: 0,
             busy: false,
-            fields: [
-                {
-                    key: "name",
-                    label: _l("Name"),
-                    sortable: true,
-                },
-                {
-                    key: "section",
-                    label: _l("Section"),
-                    sortable: true,
-                },
-                {
-                    key: "workflow",
-                    label: _l("Workflow Compatible"),
-                    sortable: false,
-                },
-                {
-                    key: "target",
-                    label: _l("Local Tool"),
-                    sortable: false,
-                },
-                {
-                    key: "open",
-                    label: "",
-                },
-            ],
         };
     },
     computed: {
@@ -121,7 +66,7 @@ export default {
     methods: {
         onOpen(tool) {
             if (tool.id === "upload1") {
-                openGlobalUploadModal();
+                this.openGlobalUploadModal();
             } else if (tool.form_style === "regular") {
                 // encode spaces in tool.id
                 const toolId = tool.id;
@@ -181,3 +126,19 @@ export default {
     },
 };
 </script>
+
+<style lang="scss" scoped>
+@import "theme/blue.scss";
+
+.tools-list-table {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+
+    .list-end {
+        width: 100%;
+        text-align: center;
+        color: $text-light;
+    }
+}
+</style>
diff --git a/client/src/components/ToolsView/ToolsSchemaJson/ToolsJson.test.js b/client/src/components/ToolsView/ToolsSchemaJson/ToolsJson.test.js
index 4bd0420d913..78bb3f5bf8b 100644
--- a/client/src/components/ToolsView/ToolsSchemaJson/ToolsJson.test.js
+++ b/client/src/components/ToolsView/ToolsSchemaJson/ToolsJson.test.js
@@ -4,7 +4,7 @@ import testToolsListResponse from "../testData/toolsList";
 import MockAdapter from "axios-mock-adapter";
 import axios from "axios";
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import flushPromises from "flush-promises";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/Toolshed/InstalledList/Index.test.js b/client/src/components/Toolshed/InstalledList/Index.test.js
index 38c5016b382..d733d3e4b89 100644
--- a/client/src/components/Toolshed/InstalledList/Index.test.js
+++ b/client/src/components/Toolshed/InstalledList/Index.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import Index from "./Index";
 
 jest.mock("app");
diff --git a/client/src/components/Toolshed/InstalledList/Monitor.test.js b/client/src/components/Toolshed/InstalledList/Monitor.test.js
index 432029bc7e0..7774b97197d 100644
--- a/client/src/components/Toolshed/InstalledList/Monitor.test.js
+++ b/client/src/components/Toolshed/InstalledList/Monitor.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import Monitor from "./Monitor";
 
 jest.mock("app");
diff --git a/client/src/components/Toolshed/RepositoryDetails/InstallationSettings.test.js b/client/src/components/Toolshed/RepositoryDetails/InstallationSettings.test.js
index f0b6aacf56d..6902e5610b0 100644
--- a/client/src/components/Toolshed/RepositoryDetails/InstallationSettings.test.js
+++ b/client/src/components/Toolshed/RepositoryDetails/InstallationSettings.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import InstallationSettings from "./InstallationSettings";
 
 jest.mock("app");
diff --git a/client/src/components/Toolshed/RepositoryDetails/RepositoryTools.test.js b/client/src/components/Toolshed/RepositoryDetails/RepositoryTools.test.js
index 1d961103ced..a792a004e96 100644
--- a/client/src/components/Toolshed/RepositoryDetails/RepositoryTools.test.js
+++ b/client/src/components/Toolshed/RepositoryDetails/RepositoryTools.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import RepositoryTools from "./RepositoryTools";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/Toolshed/SearchList/ServerSelection.test.js b/client/src/components/Toolshed/SearchList/ServerSelection.test.js
index 80524750123..575212f52c5 100644
--- a/client/src/components/Toolshed/SearchList/ServerSelection.test.js
+++ b/client/src/components/Toolshed/SearchList/ServerSelection.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import ServerSelection from "./ServerSelection";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/Tour/Tour.test.js b/client/src/components/Tour/Tour.test.js
index b1d6eb74b2d..265caf750e0 100644
--- a/client/src/components/Tour/Tour.test.js
+++ b/client/src/components/Tour/Tour.test.js
@@ -1,5 +1,5 @@
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import TourList from "./TourList.vue";
 import MockAdapter from "axios-mock-adapter";
 import axios from "axios";
diff --git a/client/src/components/Upload/Collection.test.js b/client/src/components/Upload/Collection.test.js
index 521a2d332ae..4024979a9c8 100644
--- a/client/src/components/Upload/Collection.test.js
+++ b/client/src/components/Upload/Collection.test.js
@@ -1,9 +1,9 @@
 import Collection from "./Collection.vue";
-import { mountWithApp } from "./testHelpers";
+import { mountWithDetails } from "./testHelpers";
 
 describe("Collection.vue", () => {
     it("loads with correct initial state", async () => {
-        const { wrapper } = mountWithApp(Collection);
+        const { wrapper } = mountWithDetails(Collection);
         expect(wrapper.vm.counterAnnounce).toBe(0);
         expect(wrapper.vm.showHelper).toBe(true);
         expect(wrapper.vm.extensions[0].id).toBe("ab1");
@@ -14,21 +14,19 @@ describe("Collection.vue", () => {
     });
 
     it("does render FTP is site set", async () => {
-        const { wrapper } = mountWithApp(Collection);
+        const { wrapper } = mountWithDetails(Collection);
         expect(wrapper.find("#btn-ftp").element).toBeVisible();
     });
 
     it("doesn't render FTP is no site set", async () => {
-        const { wrapper } = mountWithApp(Collection, {
-            currentFtp: () => {
-                return null;
-            },
+        const { wrapper } = mountWithDetails(Collection, {
+            currentFtp: null,
         });
         expect(wrapper.findAll("#btn-ftp").length).toBe(0);
     });
 
     it("resets properly", async () => {
-        const { wrapper, localVue } = mountWithApp(Collection);
+        const { wrapper, localVue } = mountWithDetails(Collection);
         expect(wrapper.vm.showHelper).toBe(true);
         await localVue.nextTick();
         await wrapper.find("#btn-new").trigger("click");
@@ -43,7 +41,7 @@ describe("Collection.vue", () => {
     });
 
     it("respects lazyLoadMax limit", async () => {
-        const { wrapper, localVue } = mountWithApp(Collection, {}, { lazyLoadMax: 2 });
+        const { wrapper, localVue } = mountWithDetails(Collection, {}, { lazyLoadMax: 2 });
         expect(wrapper.findAll(".ui-limitloader").length).toBe(1);
         await localVue.nextTick();
         await wrapper.find("#btn-new").trigger("click");
diff --git a/client/src/components/Upload/Collection.vue b/client/src/components/Upload/Collection.vue
index 3b31d6fd8e0..95e1a0fdea8 100644
--- a/client/src/components/Upload/Collection.vue
+++ b/client/src/components/Upload/Collection.vue
@@ -134,8 +134,8 @@ export default {
             uploadUrl: null,
             topInfo: "",
             showHelper: true,
-            extension: this.app.defaultExtension,
-            genome: this.app.defaultDbKey,
+            extension: this.details.defaultExtension,
+            genome: this.details.defaultDbKey,
             collectionType: "list",
             listExtensions: [],
             listGenomes: [],
@@ -168,7 +168,7 @@ export default {
             return result;
         },
         appModel() {
-            return this.app.model;
+            return this.details.model;
         },
     },
     watch: {
@@ -221,7 +221,7 @@ export default {
             ondragleave: () => {
                 this.highlightBox = false;
             },
-            chunkSize: this.app.chunkUploadSize,
+            chunkSize: this.details.chunkUploadSize,
         });
         this.collection.on("remove", (model) => {
             this._eventRemove(model);
@@ -289,8 +289,8 @@ export default {
                 this.counterError = 0;
                 this.counterRunning = 0;
                 this.uploadbox.reset();
-                this.extension = this.app.defaultExtension;
-                this.genome = this.app.defaultDbKey;
+                this.extension = this.details.defaultExtension;
+                this.genome = this.details.defaultDbKey;
                 this.appModel.set("percentage", 0);
                 this._updateStateForCounters();
             }
diff --git a/client/src/components/Upload/Composite.test.js b/client/src/components/Upload/Composite.test.js
index 894cc583c49..7beeb1bb880 100644
--- a/client/src/components/Upload/Composite.test.js
+++ b/client/src/components/Upload/Composite.test.js
@@ -1,9 +1,9 @@
 import Composite from "./Composite.vue";
-import { mountWithApp } from "./testHelpers";
+import { mountWithDetails } from "./testHelpers";
 
 describe("Composite.vue", () => {
     it("loads with correct initial state", async () => {
-        const { wrapper } = mountWithApp(Composite);
+        const { wrapper } = mountWithDetails(Composite);
         expect(wrapper.find("#btn-start").classes()).toEqual(expect.arrayContaining(["disabled"]));
         expect(wrapper.vm.showHelper).toBe(true);
         expect(wrapper.vm.readyStart).toBe(false);
diff --git a/client/src/components/Upload/Composite.vue b/client/src/components/Upload/Composite.vue
index ef1bdf91e3b..cf7d99a5e68 100644
--- a/client/src/components/Upload/Composite.vue
+++ b/client/src/components/Upload/Composite.vue
@@ -72,7 +72,7 @@ export default {
     data() {
         return {
             extension: "_select_",
-            genome: this.app.defaultDbKey,
+            genome: this.details.defaultDbKey,
             listExtensions: [],
             listGenomes: [],
             running: false,
@@ -160,7 +160,7 @@ export default {
                 });
             });
             submitUpload({
-                url: this.app.uploadPath,
+                url: this.details.uploadPath,
                 data: uploadModelsToPayload(this.collection.filter(), this.history_id, true),
                 success: (message) => {
                     this._eventSuccess(message);
@@ -178,8 +178,8 @@ export default {
         _eventReset: function () {
             if (this.collection.where({ status: "running" }).length == 0) {
                 this.collection.reset();
-                this.extension = this.app.defaultExtension;
-                this.genome = this.app.defaultDbKey;
+                this.extension = this.details.defaultExtension;
+                this.genome = this.details.defaultDbKey;
                 this.renderNonReactiveComponents();
             }
         },
diff --git a/client/src/components/Upload/Default.test.js b/client/src/components/Upload/Default.test.js
index c032b753d21..f20a18fc78f 100644
--- a/client/src/components/Upload/Default.test.js
+++ b/client/src/components/Upload/Default.test.js
@@ -1,5 +1,5 @@
 import Default from "./Default.vue";
-import { mountWithApp } from "./testHelpers";
+import { mountWithDetails } from "./testHelpers";
 import Backbone from "backbone";
 
 jest.mock("app");
@@ -10,7 +10,7 @@ UploadRow.mockImplementation(Backbone.View);
 
 describe("Default.vue", () => {
     it("loads with correct initial state", async () => {
-        const { wrapper } = mountWithApp(Default);
+        const { wrapper } = mountWithDetails(Default);
         expect(wrapper.vm.counterAnnounce).toBe(0);
         expect(wrapper.vm.showHelper).toBe(true);
         expect(wrapper.vm.extensions[0].id).toBe("ab1");
@@ -20,23 +20,21 @@ describe("Default.vue", () => {
     });
 
     it("does render FTP is site set", async () => {
-        const { wrapper } = mountWithApp(Default);
+        const { wrapper } = mountWithDetails(Default);
         expect(wrapper.find("#btn-ftp").element).toBeVisible();
         await wrapper.find("#btn-ftp").trigger("click");
         // TODO: test popover appears... not sure best way to do this...
     });
 
     it("doesn't render FTP is no site set", async () => {
-        const { wrapper } = mountWithApp(Default, {
-            currentFtp: () => {
-                return null;
-            },
+        const { wrapper } = mountWithDetails(Default, {
+            currentFtp: null,
         });
         expect(wrapper.findAll("#btn-ftp").length).toBe(0);
     });
 
     it("resets properly", async () => {
-        const { wrapper, localVue } = mountWithApp(Default);
+        const { wrapper, localVue } = mountWithDetails(Default);
         expect(wrapper.vm.showHelper).toBe(true);
         await localVue.nextTick();
         await wrapper.find("#btn-new").trigger("click");
@@ -47,7 +45,7 @@ describe("Default.vue", () => {
     });
 
     it("renders a limitloader element if lazyLoadMax set", async () => {
-        const { wrapper } = mountWithApp(Default, {}, { lazyLoadMax: 2 });
+        const { wrapper } = mountWithDetails(Default, {}, { lazyLoadMax: 2 });
         expect(wrapper.findAll(".ui-limitloader").length).toBe(1);
         // hard to actually test the functionality like in Collection.test.js
         // because we're stubbing out all of UploadRow.
diff --git a/client/src/components/Upload/Default.vue b/client/src/components/Upload/Default.vue
index 92eb6d379a6..4953195bcce 100644
--- a/client/src/components/Upload/Default.vue
+++ b/client/src/components/Upload/Default.vue
@@ -123,8 +123,8 @@ export default {
             topInfo: "",
             highlightBox: false,
             showHelper: true,
-            extension: this.app.defaultExtension,
-            genome: this.app.defaultDbKey,
+            extension: this.details.defaultExtension,
+            genome: this.details.defaultDbKey,
             listExtensions: [],
             listGenomes: [],
             running: false,
@@ -151,7 +151,7 @@ export default {
             return result;
         },
         appModel() {
-            return this.app.model;
+            return this.details.model;
         },
     },
     watch: {
@@ -205,7 +205,7 @@ export default {
             ondragleave: () => {
                 this.highlightBox = false;
             },
-            chunkSize: this.app.chunkUploadSize,
+            chunkSize: this.details.chunkUploadSize,
         });
         this.collection.on("remove", (model) => {
             this._eventRemove(model);
@@ -241,8 +241,8 @@ export default {
                 this.counterError = 0;
                 this.counterRunning = 0;
                 this.uploadbox.reset();
-                this.extension = this.app.defaultExtension;
-                this.genome = this.app.defaultDbKey;
+                this.extension = this.details.defaultExtension;
+                this.genome = this.details.defaultDbKey;
                 this.appModel.set("percentage", 0);
                 this._updateStateForCounters();
             }
diff --git a/client/src/components/Upload/DragAndDropModal.vue b/client/src/components/Upload/DragAndDropModal.vue
new file mode 100644
index 00000000000..8baef9b46cc
--- /dev/null
+++ b/client/src/components/Upload/DragAndDropModal.vue
@@ -0,0 +1,71 @@
+<script setup>
+import { ref, computed } from "vue";
+import { useFileDrop } from "composables/fileDrop";
+import { useGlobalUploadModal } from "composables/globalUploadModal";
+
+const modalContentElement = ref(null);
+const { isFileOverDocument, isFileOverDropZone } = useFileDrop(modalContentElement, onDrop, true);
+
+const modalClass = computed(() => {
+    if (isFileOverDropZone.value) {
+        return "ui-drag-and-drop-modal drag-over";
+    } else {
+        return "ui-drag-and-drop-modal";
+    }
+});
+
+const { openGlobalUploadModal } = useGlobalUploadModal();
+
+function onDrop(event) {
+    console.debug(event.dataTransfer);
+
+    if (event.dataTransfer?.files?.length > 0) {
+        openGlobalUploadModal({
+            immediateUpload: true,
+            immediateFiles: event.dataTransfer.files,
+        });
+    }
+}
+</script>
+
+<template>
+    <b-modal v-model="isFileOverDocument" :modal-class="modalClass" hide-header hide-footer centered>
+        <div ref="modalContentElement" class="inner-content h-xl">Drop Files here to Upload</div>
+    </b-modal>
+</template>
+
+<style lang="scss">
+@import "theme/blue.scss";
+
+.ui-drag-and-drop-modal {
+    .modal-content {
+        background-color: transparent;
+        border-radius: 16px;
+        border: 6px dashed;
+        border-color: $brand-secondary;
+        min-height: 40vh;
+
+        .modal-body {
+            display: flex;
+        }
+
+        .inner-content {
+            flex: 1 1 auto;
+            display: grid;
+            place-items: center;
+            color: $brand-secondary;
+            font-weight: bold;
+        }
+    }
+
+    &.drag-over {
+        .modal-content {
+            border-color: lighten($brand-info, 30%);
+
+            .inner-content {
+                color: lighten($brand-info, 30%);
+            }
+        }
+    }
+}
+</style>
diff --git a/client/src/components/Upload/RulesInput.test.js b/client/src/components/Upload/RulesInput.test.js
index 06a711632af..322cd7b5e9a 100644
--- a/client/src/components/Upload/RulesInput.test.js
+++ b/client/src/components/Upload/RulesInput.test.js
@@ -1,14 +1,14 @@
 import RulesInput from "./RulesInput.vue";
-import { mountWithApp } from "./testHelpers";
+import { mountWithDetails } from "./testHelpers";
 
 describe("RulesInput.vue", () => {
     it("loads with correct initial state", async () => {
-        const { wrapper } = mountWithApp(RulesInput);
+        const { wrapper } = mountWithDetails(RulesInput);
         expect(wrapper.find("#btn-reset").classes()).toEqual(expect.arrayContaining(["disabled"]));
     });
 
     it("enables reset when sourceContent is populated", async () => {
-        const { wrapper } = mountWithApp(RulesInput);
+        const { wrapper } = mountWithDetails(RulesInput);
         const textInput = wrapper.find(".upload-rule-source-content");
         expect(textInput.element.value).toBe("");
         await textInput.setValue("a b c d");
diff --git a/client/src/components/Upload/UploadBoxMixin.js b/client/src/components/Upload/UploadBoxMixin.js
index 35c611c6d2e..f16b0b76efe 100644
--- a/client/src/components/Upload/UploadBoxMixin.js
+++ b/client/src/components/Upload/UploadBoxMixin.js
@@ -22,10 +22,6 @@ export default {
         Select2,
     },
     props: {
-        app: {
-            type: Object,
-            required: true,
-        },
         lazyLoadMax: {
             type: Number,
             default: null,
@@ -38,6 +34,10 @@ export default {
             type: Boolean,
             default: false,
         },
+        details: {
+            type: Object,
+            required: true,
+        },
     },
     computed: {
         btnFilesTitle() {
@@ -55,12 +55,7 @@ export default {
             return this.hasCallback ? "Cancel" : "Close";
         },
         history_id() {
-            const storeId = this.$store?.getters["history/currentHistoryId"];
-            if (storeId) {
-                return storeId;
-            }
-            const legacyId = this.app.currentHistory();
-            return legacyId;
+            return this.details.history_id;
         },
     },
     methods: {
@@ -119,7 +114,7 @@ export default {
                 }
             });
             if (list.length > 0) {
-                const data = uploadModelsToPayload(list, this.history_id);
+                const data = uploadModelsToPayload(list, this.details.history_id);
                 axios
                     .post(`${getAppRoot()}api/tools/fetch`, data)
                     .then((message) => {
@@ -289,6 +284,9 @@ export default {
         _eventCreate: function () {
             this.uploadbox.add([{ name: defaultNewFileName, size: 0, mode: "new" }]);
         },
+        addFiles: function (files) {
+            this.uploadbox.add(files);
+        },
         /** Pause upload process */
         _eventStop: function () {
             if (this.counterRunning > 0) {
@@ -305,7 +303,7 @@ export default {
             return $(this.$refs.uploadTable);
         },
         extensionDetails(extension) {
-            return findExtension(this.app.effectiveExtensions, extension);
+            return findExtension(this.details.effectiveExtensions, extension);
         },
         initExtensionInfo() {
             $(this.$refs.footerExtensionInfo)
@@ -329,10 +327,10 @@ export default {
             this.collection = new UploadModel.Collection();
         },
         initAppProperties() {
-            this.listExtensions = this.app.effectiveExtensions;
-            this.listGenomes = this.app.listGenomes;
-            this.ftpUploadSite = this.app.currentFtp();
-            this.fileSourcesConfigured = this.app.fileSourcesConfigured;
+            this.listExtensions = this.details.effectiveExtensions;
+            this.listGenomes = this.details.listGenomes;
+            this.ftpUploadSite = this.details.currentFtp;
+            this.fileSourcesConfigured = this.details.fileSourcesConfigured;
         },
         initFtpPopover() {
             // add ftp file viewer
@@ -348,7 +346,7 @@ export default {
             this.collection.each((model) => {
                 if (
                     model.get("status") == "init" &&
-                    (model.get("extension") == this.app.defaultExtension || !defaults_only)
+                    (model.get("extension") == this.details.defaultExtension || !defaults_only)
                 ) {
                     model.set("extension", extension);
                 }
@@ -356,7 +354,10 @@ export default {
         },
         updateGenome: function (genome, defaults_only) {
             this.collection.each((model) => {
-                if (model.get("status") == "init" && (model.get("genome") == this.app.defaultDbKey || !defaults_only)) {
+                if (
+                    model.get("status") == "init" &&
+                    (model.get("genome") == this.details.defaultDbKey || !defaults_only)
+                ) {
                     model.set("genome", genome);
                 }
             });
diff --git a/client/src/components/Upload/UploadButton.vue b/client/src/components/Upload/UploadButton.vue
index 3cd86885061..cfa90e5ae88 100644
--- a/client/src/components/Upload/UploadButton.vue
+++ b/client/src/components/Upload/UploadButton.vue
@@ -28,7 +28,8 @@ import { VBTooltip } from "bootstrap-vue";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { faUpload } from "@fortawesome/free-solid-svg-icons";
-import { openGlobalUploadModal } from "./mount";
+import { useGlobalUploadModal } from "composables/globalUploadModal";
+
 library.add(faUpload);
 
 export default {
@@ -39,6 +40,10 @@ export default {
     props: {
         title: { type: String, default: "Download from URL or upload files from disk" },
     },
+    setup() {
+        const { openGlobalUploadModal } = useGlobalUploadModal();
+        return { openGlobalUploadModal };
+    },
     data() {
         return {
             status: "",
@@ -58,7 +63,7 @@ export default {
     },
     methods: {
         showUploadDialog() {
-            openGlobalUploadModal();
+            this.openGlobalUploadModal();
         },
         setStatus(val) {
             this.status = val;
diff --git a/client/src/components/Upload/UploadModal.test.js b/client/src/components/Upload/UploadModal.test.js
index 8c2317b1f88..8767da5f6ea 100644
--- a/client/src/components/Upload/UploadModal.test.js
+++ b/client/src/components/Upload/UploadModal.test.js
@@ -2,12 +2,12 @@ import MockAdapter from "axios-mock-adapter";
 import axios from "axios";
 import UploadModal from "./UploadModal";
 import UploadModalContent from "./UploadModalContent";
-import store from "../../store";
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
-
-import MockCurrentUser from "../providers/MockCurrentUser";
-import MockCurrentHistory from "../providers/MockCurrentHistory";
+import { getLocalVue, mockModule } from "tests/jest/helpers";
+import { userStore } from "store/userStore";
+import { historyStore } from "store/historyStore";
+import { configStore } from "store/configStore";
+import Vuex from "vuex";
 
 jest.mock("app");
 
@@ -17,6 +17,16 @@ const propsData = {
     fileSourcesConfigured: true,
 };
 
+const createStore = () => {
+    return new Vuex.Store({
+        modules: {
+            user: mockModule(userStore, { currentUser: { id: "fakeuser" } }),
+            history: mockModule(historyStore, { currentHistoryId: "fakehistory", histories: { fakehistory: {} } }),
+            config: mockModule(configStore, { config: {} }),
+        },
+    });
+};
+
 describe("UploadModal.vue", () => {
     let wrapper;
     let axiosMock;
@@ -47,17 +57,14 @@ describe("UploadModal.vue", () => {
         axiosMock.onGet(`/api/datatypes?extension_only=False`).reply(200, datatypesResponse);
 
         const localVue = getLocalVue();
+        const store = createStore();
 
         wrapper = await mount(UploadModal, {
             store,
+            provide: { store },
             propsData,
             localVue,
             stubs: {
-                // Need to stub all this horrible-ness because of the last 2 tests
-                // which need to dig into the first layer of the mount tree, will remove
-                // all of this shortly with a PR that completely replaces Upload
-                CurrentUser: MockCurrentUser({ id: "fakeuser" }),
-                UserHistories: MockCurrentHistory({ id: "fakehistory" }),
                 BTabs: true,
                 BTab: true,
                 Collection: true,
@@ -66,6 +73,8 @@ describe("UploadModal.vue", () => {
                 RulesInput: true,
             },
         });
+
+        await wrapper.vm.open();
     });
 
     afterEach(() => {
@@ -74,8 +83,9 @@ describe("UploadModal.vue", () => {
     });
 
     it("should load with correct defaults", async () => {
-        expect(wrapper.vm.auto.id).toBe("auto");
-        expect(wrapper.vm.datatypesDisableAuto).toBe(false);
+        const contentWrapper = wrapper.findComponent(UploadModalContent);
+        expect(contentWrapper.vm.auto.id).toBe("auto");
+        expect(contentWrapper.vm.datatypesDisableAuto).toBe(false);
     });
 
     it("should fetch datatypes and parse them", async () => {
diff --git a/client/src/components/Upload/UploadModal.vue b/client/src/components/Upload/UploadModal.vue
index 832a28c590a..eb11bab2507 100644
--- a/client/src/components/Upload/UploadModal.vue
+++ b/client/src/components/Upload/UploadModal.vue
@@ -1,89 +1,118 @@
-<!--
-Temporary modal wrapper until I replace the entire UploadModal which desperately needs a rewrite.
-Provides user and current history to modal because it currently has initialization sequence issues
--->
+<script setup>
+import UploadModalContent from "./UploadModalContent";
+
+import { ref, watch } from "vue";
+import { getAppRoot } from "onload";
+
+import { useCurrentUser } from "composables/user";
+import { useUserHistories } from "composables/userHistories";
+import { useConfig } from "composables/config";
+
+const { currentUser } = useCurrentUser();
+const { currentHistoryId } = useUserHistories(currentUser);
+
+const { config, isLoaded } = useConfig();
+
+function getDefaultOptions() {
+    const baseOptions = {
+        title: "Upload from Disk or Web",
+        modalStatic: true,
+        callback: null,
+        multiple: true,
+        selectable: false,
+        uploadPath: "",
+        immediateUpload: false,
+        immediateFiles: null,
+    };
+
+    const configOptions = isLoaded.value
+        ? {
+              uploadPath: config.value.nginx_upload_path ?? `${getAppRoot()}api/tools`,
+              chunkUploadSize: config.value.chunk_upload_size,
+              fileSourcesConfigured: config.value.file_sources_configured,
+              ftpUploadSite: config.value.ftp_upload_site,
+              defaultDbKey: config.value.default_genome,
+              defaultExtension: config.value.default_extension,
+          }
+        : {};
+
+    return { ...baseOptions, ...configOptions };
+}
+
+const options = ref(getDefaultOptions());
+const showModal = ref(false);
+const content = ref(null);
+
+function dismiss(result) {
+    if (result && options.value.callback) {
+        options.value.callback(result);
+    }
+
+    showModal.value = false;
+}
+
+function wait(milliseconds) {
+    return new Promise((resolve) => {
+        setTimeout(() => resolve(), milliseconds);
+    });
+}
+
+async function open(overrideOptions) {
+    const newOptions = overrideOptions ?? {};
+
+    options.value = { ...getDefaultOptions(), ...newOptions };
+
+    if (options.value.callback) {
+        options.value.hasCallback = true;
+    }
+
+    showModal.value = true;
+    await wait(100);
+
+    if (options.value.immediateUpload) {
+        content.value.immediateUpload(options.value.immediateFiles);
+    }
+}
+
+watch(
+    () => showModal.value,
+    (modalShown) => setIframeEvents(modalShown)
+);
+
+function setIframeEvents(disableEvents) {
+    const element = document.getElementById("galaxy_main");
+
+    if (element) {
+        element.style["pointer-events"] = disableEvents ? "none" : "auto";
+    }
+}
+
+defineExpose({
+    open,
+});
+</script>
 
 <template>
-    <CurrentUser v-slot="{ user }">
-        <UserHistories v-if="user" v-slot="{ currentHistoryId }" :user="user">
-            <b-modal
-                v-model="modalShow"
-                :static="modalStatic"
-                header-class="no-separator"
-                modal-class="ui-modal"
-                dialog-class="upload-dialog"
-                body-class="upload-dialog-body"
-                no-enforce-focus
-                hide-footer>
-                <template v-slot:modal-header>
-                    <h2 class="title h-sm" tabindex="0">{{ title | localize }}</h2>
-                </template>
+    <b-modal
+        v-model="showModal"
+        :static="options.modalStatic"
+        header-class="no-separator"
+        modal-class="ui-modal"
+        dialog-class="upload-dialog"
+        body-class="upload-dialog-body"
+        no-enforce-focus
+        hide-footer>
+        <template v-slot:modal-header>
+            <h2 class="title h-sm" tabindex="0">{{ options.title }}</h2>
+        </template>
 
-                <UploadModalContent
-                    v-if="currentHistoryId"
-                    :current-user-id="user.id"
-                    :current-history-id="currentHistoryId"
-                    v-bind="{ ...$props, ...$attrs }"
-                    @dismiss="dismiss" />
-            </b-modal>
-        </UserHistories>
-    </CurrentUser>
+        <UploadModalContent
+            v-if="currentHistoryId"
+            ref="content"
+            :key="showModal"
+            :current-user-id="currentUser.id"
+            :current-history-id="currentHistoryId"
+            v-bind="options"
+            @dismiss="dismiss" />
+    </b-modal>
 </template>
-
-<script>
-import CurrentUser from "../providers/CurrentUser";
-import UserHistories from "components/providers/UserHistories";
-import UploadModalContent from "./UploadModalContent";
-import { commonProps } from "./helpers";
-
-export default {
-    components: {
-        CurrentUser,
-        UserHistories,
-        UploadModalContent,
-    },
-    props: {
-        title: { type: String, default: "Download from web or upload from disk" },
-        modalStatic: { type: Boolean, default: true },
-        ...commonProps,
-    },
-    data() {
-        return {
-            modalShow: false,
-        };
-    },
-    watch: {
-        modalShow() {
-            this.setIframeEvents(this.modalShow);
-        },
-    },
-    mounted() {
-        this.show();
-        // handles subsequent external requests to re-open a re-used modal
-        this.$root.$on("openUpload", this.show);
-    },
-    methods: {
-        show() {
-            this.modalShow = true;
-        },
-        hide() {
-            this.modalShow = false;
-        },
-        dismiss(result) {
-            if (undefined !== result) {
-                this.$root.$emit("uploadResult", result);
-            }
-            this.hide();
-        },
-        /** Disable mouse events in iframe to prevent interference with uploader drop box */
-        setIframeEvents(disableEvents) {
-            const element = document.getElementById("galaxy_main");
-            if (element) {
-                element.style["pointer-events"] = disableEvents ? "none" : "auto";
-            } else {
-                console.warn("UploadModal::setIframeEvents - `galaxy_main` not found.");
-            }
-        },
-    },
-};
-</script>
diff --git a/client/src/components/Upload/UploadModalContent.vue b/client/src/components/Upload/UploadModalContent.vue
index 94a1c036376..e3ddd0fb8a6 100644
--- a/client/src/components/Upload/UploadModalContent.vue
+++ b/client/src/components/Upload/UploadModalContent.vue
@@ -2,7 +2,8 @@
     <b-tabs v-if="ready">
         <b-tab v-if="showRegular" id="regular" title="Regular" button-id="tab-title-link-regular">
             <default
-                :app="this"
+                ref="regular"
+                :details="details"
                 :lazy-load-max="50"
                 :multiple="multiple"
                 :has-callback="hasCallback"
@@ -10,13 +11,13 @@
                 v-on="$listeners" />
         </b-tab>
         <b-tab v-if="showComposite" id="composite" title="Composite" button-id="tab-title-link-composite">
-            <composite :app="this" :has-callback="hasCallback" :selectable="selectable" v-on="$listeners" />
+            <composite :details="details" :has-callback="hasCallback" :selectable="selectable" v-on="$listeners" />
         </b-tab>
         <b-tab v-if="showCollection" id="collection" title="Collection" button-id="tab-title-link-collection">
-            <collection :app="this" :has-callback="hasCallback" :selectable="selectable" v-on="$listeners" />
+            <collection :details="details" :has-callback="hasCallback" :selectable="selectable" v-on="$listeners" />
         </b-tab>
         <b-tab v-if="showRules" id="rule-based" title="Rule-based" button-id="tab-title-link-rule-based">
-            <rules-input :app="this" :has-callback="hasCallback" :selectable="selectable" v-on="$listeners" />
+            <rules-input :details="details" :has-callback="hasCallback" :selectable="selectable" v-on="$listeners" />
         </b-tab>
     </b-tabs>
     <div v-else>
@@ -35,7 +36,6 @@ import RulesInput from "./RulesInput";
 import LoadingSpan from "components/LoadingSpan";
 import { uploadModelsToPayload } from "./helpers";
 import { BTabs, BTab } from "bootstrap-vue";
-import { commonProps } from "./helpers";
 
 export default {
     components: {
@@ -50,7 +50,29 @@ export default {
     props: {
         currentHistoryId: { type: String, required: true },
         currentUserId: { type: String, default: "" },
-        ...commonProps,
+        uploadPath: { type: String, required: true },
+        chunkUploadSize: { type: Number, default: 1024 },
+        fileSourcesConfigured: { type: Boolean, default: false },
+        ftpUploadSite: { type: String, default: "" },
+        defaultDbKey: { type: String, default: UploadUtils.DEFAULT_DBKEY },
+        defaultExtension: { type: String, default: UploadUtils.DEFAULT_EXTENSION },
+        datatypesDisableAuto: { type: Boolean, default: false },
+        formats: { type: Array, default: null },
+        multiple: {
+            // Restrict the forms to a single dataset upload if false
+            type: Boolean,
+            default: true,
+        },
+        hasCallback: {
+            // Return uploads when done if supplied.
+            type: Boolean,
+            default: false,
+        },
+        selectable: { type: Boolean, default: false },
+        auto: {
+            type: Object,
+            default: () => UploadUtils.AUTO_EXTENSION,
+        },
     },
     data: function () {
         return {
@@ -113,6 +135,23 @@ export default {
             }
             return this.multiple;
         },
+        currentFtp() {
+            return this.currentUserId && this.ftpUploadSite;
+        },
+        details() {
+            return {
+                effectiveExtensions: this.effectiveExtensions,
+                listGenomes: this.listGenomes,
+                currentFtp: this.currentFtp,
+                fileSourcesConfigured: this.fileSourcesConfigured,
+                defaultExtension: this.defaultExtension,
+                defaultDbKey: this.defaultDbKey,
+                uploadPath: this.uploadPath,
+                model: this.model,
+                chunkUploadSize: this.chunkUploadSize,
+                history_id: this.currentHistoryId,
+            };
+        },
     },
     created() {
         this.model = new Backbone.Model({
@@ -170,9 +209,6 @@ export default {
         this.id = String(this._uid);
     },
     methods: {
-        currentFtp: function () {
-            return this.currentUserId && this.ftpUploadSite;
-        },
         /**
          * Package API data from array of backbone models
          * @param{Array} items - Upload items/rows filtered from a collection
@@ -180,6 +216,10 @@ export default {
         toData: function (items, history_id, composite = false) {
             return uploadModelsToPayload(items, history_id, composite);
         },
+        immediateUpload: function (files) {
+            this.$refs.regular?.addFiles(files);
+            this.$refs.regular?._eventStart();
+        },
     },
 };
 </script>
diff --git a/client/src/components/Upload/config.js b/client/src/components/Upload/config.js
deleted file mode 100644
index 4d2f01ae353..00000000000
--- a/client/src/components/Upload/config.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { getGalaxyInstance } from "app";
-import { getAppRoot } from "onload";
-
-export function initializeUploadDefaults(propsData = {}) {
-    const Galaxy = getGalaxyInstance();
-    const appRoot = getAppRoot();
-    const defaults = {
-        multiple: true,
-        uploadPath: Galaxy.config.nginx_upload_path || `${appRoot}api/tools`,
-        chunkUploadSize: Galaxy.config.chunk_upload_size,
-        fileSourcesConfigured: Galaxy.config.file_sources_configured,
-        ftpUploadSite: Galaxy.config.ftp_upload_site,
-        defaultDbKey: Galaxy.config.default_genome,
-        defaultExtension: Galaxy.config.default_extension,
-        selectable: false,
-    };
-    return Object.assign({}, defaults, propsData);
-}
diff --git a/client/src/components/Upload/helpers.js b/client/src/components/Upload/helpers.js
index 5c83b9419e0..b5646be0ec1 100644
--- a/client/src/components/Upload/helpers.js
+++ b/client/src/components/Upload/helpers.js
@@ -1,4 +1,3 @@
-import UploadUtils from "mvc/upload/upload-utils";
 export const defaultNewFileName = "New File";
 
 const URI_PREFIXES = ["http", "https", "ftp", "file", "gxfiles", "gximport", "gxuserimport", "gxftp"];
@@ -109,58 +108,3 @@ export function uploadModelsToPayload(items, history_id, composite = false) {
         files: files,
     };
 }
-
-export const commonProps = {
-    uploadPath: {
-        type: String,
-        required: true,
-    },
-    chunkUploadSize: {
-        type: Number,
-        default: 1024,
-    },
-    fileSourcesConfigured: {
-        type: Boolean,
-        default: false,
-    },
-    ftpUploadSite: {
-        type: String,
-        default: "",
-    },
-    defaultDbKey: {
-        type: String,
-        default: UploadUtils.DEFAULT_DBKEY,
-    },
-    defaultExtension: {
-        type: String,
-        default: UploadUtils.DEFAULT_EXTENSION,
-    },
-    datatypesDisableAuto: {
-        type: Boolean,
-        default: false,
-    },
-    formats: {
-        type: Array,
-        default: null,
-    },
-    multiple: {
-        // Restrict the forms to a single dataset upload if false
-        type: Boolean,
-        default: true,
-    },
-    hasCallback: {
-        // Return uploads when done if supplied.
-        type: Boolean,
-        default: false,
-    },
-    selectable: {
-        type: Boolean,
-        default: false,
-    },
-    auto: {
-        type: Object,
-        default: () => {
-            return UploadUtils.AUTO_EXTENSION;
-        },
-    },
-};
diff --git a/client/src/components/Upload/index.js b/client/src/components/Upload/index.js
index 79c93e197fa..b83caf02a74 100644
--- a/client/src/components/Upload/index.js
+++ b/client/src/components/Upload/index.js
@@ -2,6 +2,4 @@
  * External entry point for Upload components (currently only the modal).
  */
 export { default as UploadModal } from "./UploadModal";
-export { initializeUploadDefaults } from "./config";
-export { openGlobalUploadModal, mountUploadModal } from "./mount";
 export { default as UploadButton } from "./UploadButton";
diff --git a/client/src/components/Upload/mount.js b/client/src/components/Upload/mount.js
deleted file mode 100644
index c94860a1f8a..00000000000
--- a/client/src/components/Upload/mount.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import UploadModal from "./UploadModal";
-import { initializeUploadDefaults } from "./config";
-import { mountVueComponent } from "utils/mountVueComponent";
-
-export function mountUploadModal(options = {}) {
-    const props = initializeUploadDefaults(options);
-
-    // should use events insted of passing in functions
-    const { callback, ...propsData } = props;
-    if (callback) {
-        // internal display characteristic
-        propsData.hasCallback = true;
-    }
-
-    const mounter = mountVueComponent(UploadModal);
-    const container = document.createElement("div");
-    document.body.appendChild(container);
-    const uploadVm = mounter(propsData, container);
-
-    if (callback) {
-        uploadVm.$once("uploadResult", callback);
-    }
-
-    return uploadVm;
-}
-
-// Global upload dialog instance
-let uploadVm = null;
-
-export function openGlobalUploadModal(options) {
-    if (!uploadVm) {
-        uploadVm = mountUploadModal(options);
-    }
-    // re-open
-    uploadVm.$emit("openUpload", uploadVm);
-    return uploadVm;
-}
diff --git a/client/src/components/Upload/testHelpers.js b/client/src/components/Upload/testHelpers.js
index b9445ca0269..1481cbc3242 100644
--- a/client/src/components/Upload/testHelpers.js
+++ b/client/src/components/Upload/testHelpers.js
@@ -4,12 +4,10 @@ import "utils/uploadbox";
 import { mount, createLocalVue } from "@vue/test-utils";
 import BootstrapVue from "bootstrap-vue";
 
-export const createMockApp = (options = {}) => {
+export const createMockDetails = (options = {}) => {
     return _.defaults(options, {
         defaultExtension: "auto",
-        currentFtp: () => {
-            return "ftp://localhost";
-        },
+        currentFtp: "ftp://localhost",
         model: new Backbone.Model(),
         effectiveExtensions: [
             { id: "ab1", text: "ab1", description: "A binary sequence file in 'ab1' format with a '.ab1'" },
@@ -34,9 +32,9 @@ export const createMockApp = (options = {}) => {
     });
 };
 
-export function mountWithApp(component, options = {}, propsData_ = {}) {
-    const app = createMockApp(options);
-    const propsData = _.defaults(propsData_, { app });
+export function mountWithDetails(component, options = {}, propsData_ = {}) {
+    const details = createMockDetails(options);
+    const propsData = _.defaults(propsData_, { details });
 
     const localVue = createLocalVue();
     localVue.use(BootstrapVue);
diff --git a/client/src/components/User/CloudAuth/CloudAuth.test.js b/client/src/components/User/CloudAuth/CloudAuth.test.js
index 91d9d17da45..39682649122 100644
--- a/client/src/components/User/CloudAuth/CloudAuth.test.js
+++ b/client/src/components/User/CloudAuth/CloudAuth.test.js
@@ -1,6 +1,6 @@
 import flushPromises from "flush-promises";
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 
 import { default as CloudAuth } from "./CloudAuth";
 import CloudAuthItem from "./CloudAuthItem";
diff --git a/client/src/components/User/DiskUsage/DiskUsageSummary.test.js b/client/src/components/User/DiskUsage/DiskUsageSummary.test.ts
similarity index 84%
rename from client/src/components/User/DiskUsage/DiskUsageSummary.test.js
rename to client/src/components/User/DiskUsage/DiskUsageSummary.test.ts
index 61695aa0391..d092985d9db 100644
--- a/client/src/components/User/DiskUsage/DiskUsageSummary.test.js
+++ b/client/src/components/User/DiskUsage/DiskUsageSummary.test.ts
@@ -1,10 +1,10 @@
 import { mount } from "@vue/test-utils";
-import MockConfigProvider from "components/providers/MockConfigProvider";
-import MockCurrentUser from "components/providers/MockCurrentUser";
-import MockProvider from "components/providers/MockProvider";
+import MockConfigProvider from "@/components/providers/MockConfigProvider";
+import MockCurrentUser from "@/components/providers/MockCurrentUser";
+import MockProvider from "@/components/providers/MockProvider";
 import flushPromises from "flush-promises";
-import { getLocalVue } from "jest/helpers";
-import DiskUsageSummary from "./DiskUsageSummary";
+import { getLocalVue } from "tests/jest/helpers";
+import DiskUsageSummary from "./DiskUsageSummary.vue";
 import { userStore } from "../../../store/userStore/userStore";
 import Vuex from "vuex";
 
@@ -32,7 +32,7 @@ const store = new Vuex.Store({
     },
 });
 
-async function mountDiskUsageSummaryWrapper(enableQuotas) {
+async function mountDiskUsageSummaryWrapper(enableQuotas: boolean) {
     const wrapper = mount(DiskUsageSummary, {
         stubs: {
             ConfigProvider: MockConfigProvider({
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.test.js b/client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.test.ts
similarity index 73%
rename from client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.test.js
rename to client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.test.ts
index ddbd588f893..50f75803877 100644
--- a/client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.test.js
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.test.ts
@@ -1,8 +1,8 @@
 import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
-import { getLocalVue } from "jest/helpers";
-import CleanupOperationSummary from "./CleanupOperationSummary";
-import { CleanableSummary, CleanupOperation, CleanupResult } from "./model";
+import { getLocalVue } from "../../../../../../tests/jest/helpers";
+import CleanupOperationSummary from "./CleanupOperationSummary.vue";
+import { CleanableSummary, type CleanupOperation, CleanupResult } from "./model";
 
 const localVue = getLocalVue();
 
@@ -10,37 +10,38 @@ const REVIEW_ITEMS_LINK = '[data-test-id="review-link"]';
 const NO_ITEMS_INDICATOR = '[data-test-id="no-items-indicator"]';
 
 /** Operation that can clean some items */
-const CLEANUP_OPERATION = new CleanupOperation({
+const CLEANUP_OPERATION: CleanupOperation = {
     id: "operation-id",
     name: "operation name",
     description: "operation description",
-    fetchSummary: () =>
+    fetchSummary: async () =>
         new CleanableSummary({
             totalSize: 1024,
             totalItems: 2,
         }),
-    fetchItems: () => [],
-    cleanupItems: (items) =>
+    fetchItems: async () => [],
+    cleanupItems: async () =>
         new CleanupResult({
             totalItemCount: 2,
             totalFreeBytes: 1024,
+            errors: [],
         }),
-});
+};
 /** Operation without items to clean*/
-const EMPTY_CLEANUP_OPERATION = new CleanupOperation({
+const EMPTY_CLEANUP_OPERATION: CleanupOperation = {
     id: "operation-id-empty",
     name: "empty operation",
     description: "operation that has no items to clean",
-    fetchSummary: () =>
+    fetchSummary: async () =>
         new CleanableSummary({
             totalSize: 0,
             totalItems: 0,
         }),
-    fetchItems: () => [],
-    cleanupItems: (items) => null,
-});
+    fetchItems: async () => [],
+    cleanupItems: async () => new CleanupResult(),
+};
 /** Operation that fails on every action */
-const ERROR_CLEANUP_OPERATION = new CleanupOperation({
+const ERROR_CLEANUP_OPERATION: CleanupOperation = {
     id: "operation-id-error",
     name: "operation with error",
     description: "operation causing errors",
@@ -50,17 +51,20 @@ const ERROR_CLEANUP_OPERATION = new CleanupOperation({
     fetchItems: () => {
         throw new Error("Cannot fetch items");
     },
-    cleanupItems: (items) => {
+    cleanupItems: () => {
         throw new Error("Cannot cleanup items");
     },
-});
+};
 
-async function mountCleanupOperationSummaryWith(operation, refreshOperationId = null, refreshDelay = 0) {
-    const wrapper = mount(
-        CleanupOperationSummary,
-        { propsData: { operation, refreshOperationId, refreshDelay } },
-        localVue
-    );
+async function mountCleanupOperationSummaryWith(
+    operation: CleanupOperation,
+    refreshOperationId = null,
+    refreshDelay = 0
+) {
+    const wrapper = mount(CleanupOperationSummary, {
+        propsData: { operation, refreshOperationId, refreshDelay },
+        localVue,
+    });
     await flushPromises();
     return wrapper;
 }
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.vue b/client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.vue
index 346551d03ca..37315fb1cde 100644
--- a/client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.vue
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/CleanupOperationSummary.vue
@@ -1,6 +1,74 @@
+<script setup lang="ts">
+import localize from "@/utils/localization";
+import { delay } from "@/utils/utils";
+import { computed, ref, onMounted, watchEffect } from "vue";
+import { BAlert, BCard, BCardText, BLink } from "bootstrap-vue";
+import LoadingSpan from "@/components/LoadingSpan.vue";
+import type { CleanableSummary, CleanupOperation } from "./model";
+
+interface CleanupOperationSummaryProps {
+    operation: CleanupOperation;
+    refreshOperationId?: string;
+    refreshDelay?: number;
+}
+
+const props = withDefaults(defineProps<CleanupOperationSummaryProps>(), {
+    refreshOperationId: undefined,
+    refreshDelay: 500,
+});
+
+const summary = ref<CleanableSummary>();
+const loading = ref(true);
+const errorMessage = ref<string>();
+
+const canClearItems = computed(() => {
+    return (summary.value?.totalItems ?? 0) > 0;
+});
+
+const emit = defineEmits<{
+    (e: "onReviewItems", operation: CleanupOperation, totalItems: number): void;
+}>();
+
+onMounted(async () => {
+    await refresh();
+});
+
+watchEffect(async () => {
+    if (props.operation.id === props.refreshOperationId) {
+        await refresh();
+    }
+});
+
+async function refresh() {
+    loading.value = true;
+    try {
+        const start = Date.now();
+        summary.value = await props.operation.fetchSummary();
+        const duration = Date.now() - start;
+        await delay(props.refreshDelay - duration);
+    } catch (error) {
+        onError(String(error));
+    } finally {
+        loading.value = false;
+    }
+}
+
+function onError(message: string) {
+    errorMessage.value = message;
+}
+
+function onReviewItems() {
+    emit("onReviewItems", props.operation, summary.value?.totalItems ?? 0);
+}
+</script>
+
 <template>
-    <b-card :title="operation.name" class="operation-card mx-2" footer-bg-variant="white" footer-border-variant="white">
-        <LoadingSpan v-if="loading" />
+    <b-card
+        :title="props.operation.name"
+        class="operation-card mx-2"
+        footer-bg-variant="white"
+        footer-border-variant="white">
+        <loading-span v-if="loading" />
         <b-card-text v-if="!loading">
             {{ operation.description }}
         </b-card-text>
@@ -11,97 +79,21 @@
                     {{ errorMessage }}
                 </b-alert>
                 <b-link
-                    v-else-if="canClearItems"
+                    v-else-if="summary && canClearItems"
                     href="#"
                     class="card-link"
                     data-test-id="review-link"
                     @click="onReviewItems">
-                    <b>{{ reviewAndClearText }} {{ summary.niceTotalSize }}</b>
+                    <b>{{ localize("Review and clear") }} {{ summary.niceTotalSize }}</b>
                 </b-link>
                 <b v-else class="text-secondary" data-test-id="no-items-indicator">
-                    {{ noItemsToClearText }}
+                    {{ localize("No items to clear") }}
                 </b>
             </div>
         </template>
     </b-card>
 </template>
 
-<script>
-import _l from "utils/localization";
-import { delay } from "utils/utils";
-import LoadingSpan from "components/LoadingSpan";
-import { CleanupOperation } from "./model";
-
-export default {
-    components: {
-        LoadingSpan,
-    },
-    props: {
-        operation: {
-            type: CleanupOperation,
-            required: true,
-        },
-        refreshOperationId: {
-            type: String,
-            required: false,
-            default: null,
-        },
-        refreshDelay: {
-            type: Number,
-            required: false,
-            default: 500,
-        },
-    },
-    data() {
-        return {
-            noItemsToClearText: _l("No items to clear"),
-            reviewAndClearText: _l("Review and clear"),
-            summary: null,
-            loading: true,
-            errorMessage: null,
-        };
-    },
-    computed: {
-        /** @returns {Boolean} */
-        canClearItems() {
-            return this.summary.totalItems > 0;
-        },
-    },
-    watch: {
-        /** The parent signaled that `operationId` must be updated */
-        async refreshOperationId(operationId) {
-            if (this.operation.id === operationId) {
-                await this.refresh();
-            }
-        },
-    },
-    async created() {
-        await this.refresh();
-    },
-    methods: {
-        async refresh() {
-            this.loading = true;
-            try {
-                const start = Date.now();
-                this.summary = await this.operation.fetchSummary();
-                const duration = Date.now() - start;
-                await delay(this.refreshDelay - duration);
-            } catch (error) {
-                this.onError(error);
-            } finally {
-                this.loading = false;
-            }
-        },
-        onError(err) {
-            this.errorMessage = err;
-        },
-        onReviewItems() {
-            this.$emit("onReviewItems", this.operation, this.summary.totalItems);
-        },
-    },
-};
-</script>
-
 <style scoped>
 .operation-card {
     text-align: center;
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.test.js b/client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.test.ts
similarity index 85%
rename from client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.test.js
rename to client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.test.ts
index fb7bc0ba64d..c556f9e1582 100644
--- a/client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.test.js
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.test.ts
@@ -1,7 +1,7 @@
 import { mount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
-import { getLocalVue } from "jest/helpers";
-import CleanupResultDialog from "./CleanupResultDialog";
+import { getLocalVue } from "tests/jest/helpers";
+import CleanupResultDialog from "./CleanupResultDialog.vue";
 import { CleanupResult } from "./model";
 
 const localVue = getLocalVue();
@@ -12,13 +12,19 @@ const SUCCESS_INFO = '[data-test-id="success-info"]';
 const PARTIAL_SUCCESS_INFO = '[data-test-id="partial-success-info"]';
 const ERRORS_TABLE = '[data-test-id="errors-table"]';
 
-const NO_RESULT_YET = null;
+const NO_RESULT_YET = undefined;
 const FAILED_RESULT = () => {
-    return new CleanupResult({ errorMessage: "The operation failed" });
+    return new CleanupResult({
+        errorMessage: "The operation failed",
+        totalFreeBytes: 0,
+        totalItemCount: 0,
+        errors: [],
+    });
 };
 const PARTIAL_SUCCESS_RESULT = () => {
     return new CleanupResult({
         totalItemCount: 3,
+        totalFreeBytes: 1,
         errors: [
             { name: "Dataset X", reason: "Failed because of X" },
             { name: "Dataset Y", reason: "Failed because of Y" },
@@ -26,10 +32,10 @@ const PARTIAL_SUCCESS_RESULT = () => {
     });
 };
 const SUCCESS_RESULT = () => {
-    return new CleanupResult({ totalItemCount: 2 });
+    return new CleanupResult({ totalItemCount: 2, totalFreeBytes: 2, errors: [] });
 };
-async function mountCleanupResultDialogWith(result) {
-    const wrapper = mount(CleanupResultDialog, { propsData: { result, show: true } }, localVue);
+async function mountCleanupResultDialogWith(result?: CleanupResult) {
+    const wrapper = mount(CleanupResultDialog, { propsData: { result, show: true }, localVue });
     await flushPromises();
     return wrapper;
 }
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.vue b/client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.vue
index d6300e0c651..fe6e1e90844 100644
--- a/client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.vue
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/CleanupResultDialog.vue
@@ -1,3 +1,48 @@
+<script setup lang="ts">
+import localize from "@/utils/localization";
+import { computed, ref } from "vue";
+import type { CleanupResult } from "./model";
+
+interface CleanupResultDialogProps {
+    result?: CleanupResult;
+}
+
+const props = withDefaults(defineProps<CleanupResultDialogProps>(), {
+    result: undefined,
+});
+
+const showModal = ref(false);
+
+const isLoading = computed<boolean>(() => {
+    return props.result === undefined;
+});
+
+const title = computed<string>(() => {
+    let message = localize("Something went wrong...");
+    if (isLoading.value) {
+        message = localize("Freeing up some space...");
+    } else if (props.result.isPartialSuccess) {
+        message = localize("Sorry, some items couldn't be cleared");
+    } else if (props.result.success) {
+        message = localize("Congratulations!");
+    }
+    return message;
+});
+
+const errorFields = [
+    { key: "name", label: localize("Name") },
+    { key: "reason", label: localize("Reason") },
+];
+
+function openModal() {
+    showModal.value = true;
+}
+
+defineExpose({
+    openModal,
+});
+</script>
+
 <template>
     <b-modal id="cleanup-result-modal" v-model="showModal" :title="title" title-tag="h2" hide-footer static>
         <div class="text-center">
@@ -30,52 +75,3 @@
         </div>
     </b-modal>
 </template>
-
-<script>
-import _l from "utils/localization";
-import { CleanupResult } from "./model";
-
-export default {
-    props: {
-        result: {
-            type: CleanupResult,
-            required: false,
-            default: null,
-        },
-        show: {
-            type: Boolean,
-            required: false,
-        },
-    },
-    data() {
-        return {
-            showModal: false,
-            errorFields: [
-                { key: "name", label: _l("Name") },
-                { key: "reason", label: _l("Reason") },
-            ],
-        };
-    },
-    computed: {
-        /** @returns {Boolean} */
-        isLoading() {
-            return this.result === null;
-        },
-        /** @returns {String} */
-        title() {
-            let message = _l("Something went wrong...");
-            if (this.isLoading) {
-                message = _l("Freeing up some space...");
-            } else if (this.result.isPartialSuccess) {
-                message = _l("Sorry, some items couldn't be cleared");
-            } else if (this.result.success) {
-                message = _l("Congratulations!");
-            }
-            return message;
-        },
-    },
-    created() {
-        this.showModal = this.show;
-    },
-};
-</script>
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.test.js b/client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.test.ts
similarity index 53%
rename from client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.test.js
rename to client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.test.ts
index f408f12104c..c1799d0048d 100644
--- a/client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.test.js
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.test.ts
@@ -1,8 +1,8 @@
-import { mount } from "@vue/test-utils";
+import { mount, type WrapperArray } from "@vue/test-utils";
 import flushPromises from "flush-promises";
-import { getLocalVue } from "jest/helpers";
-import { CleanableSummary, CleanupOperation, CleanupResult } from "./model";
-import ReviewCleanupDialog from "./ReviewCleanupDialog";
+import { getLocalVue } from "tests/jest/helpers";
+import { CleanableSummary, type CleanupOperation, CleanupResult } from "./model";
+import ReviewCleanupDialog from "./ReviewCleanupDialog.vue";
 
 const localVue = getLocalVue();
 
@@ -13,60 +13,58 @@ const AGREEMENT_CHECKBOX = '[data-test-id="agreement-checkbox"]';
 const CONFIRMATION_MODAL = "#confirmation-modal";
 
 const EXPECTED_TOTAL_ITEMS = 2;
-const FAKE_OPERATION = () => {
-    return new CleanupOperation({
-        id: "operation-id",
-        name: "operation name",
-        description: "operation description",
-        fetchSummary: () =>
-            new CleanableSummary({
-                totalSize: 1024,
-                totalItems: EXPECTED_TOTAL_ITEMS,
-            }),
-        fetchItems: () => [
-            { id: "1", name: "Item 1", size: 512, update_time: new Date().toISOString(), hda_ldda: "hda" },
-            { id: "2", name: "Item 2", size: 512, update_time: new Date().toISOString(), hda_ldda: "hda" },
-        ],
-        cleanupItems: (items) =>
-            new CleanupResult({
-                totalItemCount: EXPECTED_TOTAL_ITEMS,
-                totalFreeBytes: 1024,
-            }),
-    });
+const FAKE_OPERATION: CleanupOperation = {
+    id: "operation-id",
+    name: "operation name",
+    description: "operation description",
+    fetchSummary: async () =>
+        new CleanableSummary({
+            totalSize: 1024,
+            totalItems: EXPECTED_TOTAL_ITEMS,
+        }),
+    fetchItems: async () => [
+        { id: "1", name: "Item 1", size: 512, update_time: new Date().toISOString(), hda_ldda: "hda" },
+        { id: "2", name: "Item 2", size: 512, update_time: new Date().toISOString(), hda_ldda: "hda" },
+    ],
+    cleanupItems: async () =>
+        new CleanupResult({
+            totalItemCount: EXPECTED_TOTAL_ITEMS,
+            totalFreeBytes: 1024,
+            errors: [],
+        }),
 };
 
-async function mountReviewCleanupDialogWith(operation, totalItems = EXPECTED_TOTAL_ITEMS) {
-    const wrapper = mount(
-        ReviewCleanupDialog,
-        { propsData: { operation, totalItems, show: true, modalStatic: true } },
-        localVue
-    );
+async function mountReviewCleanupDialogWith(operation: CleanupOperation, totalItems = EXPECTED_TOTAL_ITEMS) {
+    const wrapper = mount(ReviewCleanupDialog, {
+        propsData: { operation, totalItems, show: true, modalStatic: true },
+        localVue,
+    });
     await flushPromises();
     return wrapper;
 }
 
 describe("ReviewCleanupDialog.vue", () => {
     it("should display a table with items to review", async () => {
-        const wrapper = await mountReviewCleanupDialogWith(FAKE_OPERATION());
+        const wrapper = await mountReviewCleanupDialogWith(FAKE_OPERATION);
 
         expect(wrapper.find(REVIEW_TABLE).exists()).toBe(true);
         expect(wrapper.findAll("tbody > tr").wrappers.length).toBe(EXPECTED_TOTAL_ITEMS);
     });
 
     it("should disable the delete button if no items are selected", async () => {
-        const wrapper = await mountReviewCleanupDialogWith(FAKE_OPERATION());
+        const wrapper = await mountReviewCleanupDialogWith(FAKE_OPERATION);
         const deleteButton = wrapper.find(DELETE_BUTTON);
         const selectAllCheckbox = wrapper.find(SELECT_ALL_CHECKBOX);
 
-        expect(deleteButton.element.disabled).toBeTruthy();
+        expect(deleteButton.attributes().disabled).toBeTruthy();
         expect(wrapper.vm.selectedItems.length).toBe(0);
         await selectAllCheckbox.setChecked();
         expect(wrapper.vm.selectedItems.length).toBe(EXPECTED_TOTAL_ITEMS);
-        expect(deleteButton.element.disabled).toBeFalsy();
+        expect(deleteButton.attributes().disabled).toBeFalsy();
     });
 
     it("should show a confirmation message when deleting items", async () => {
-        const wrapper = await mountReviewCleanupDialogWith(FAKE_OPERATION());
+        const wrapper = await mountReviewCleanupDialogWith(FAKE_OPERATION);
         await wrapper.find(SELECT_ALL_CHECKBOX).setChecked();
         const confirmationModal = wrapper.find(CONFIRMATION_MODAL);
 
@@ -76,33 +74,38 @@ describe("ReviewCleanupDialog.vue", () => {
     });
 
     it("should disable the confirmation button until the agreement has been accepted", async () => {
-        const wrapper = await mountReviewCleanupDialogWith(FAKE_OPERATION());
+        const wrapper = await mountReviewCleanupDialogWith(FAKE_OPERATION);
         await wrapper.find(SELECT_ALL_CHECKBOX).setChecked();
         await wrapper.find(DELETE_BUTTON).trigger("click");
-        const permanentlyDeleteBtn = findByText(wrapper, "button", /Permanently delete/);
+        const allButtons = wrapper.findAll(".btn");
+        const permanentlyDeleteBtn = withNameFilter(allButtons).hasText("Permanently delete").at(0);
 
-        expect(permanentlyDeleteBtn.element.disabled).toBeTruthy();
+        expect(permanentlyDeleteBtn.attributes().disabled).toBeTruthy();
         await wrapper.find(AGREEMENT_CHECKBOX).setChecked();
-        expect(permanentlyDeleteBtn.element.disabled).toBeFalsy();
+        expect(permanentlyDeleteBtn.attributes().disabled).toBeFalsy();
     });
 
     it("should emit the confirmation event when the agreement and deletion has been confirmed", async () => {
-        const wrapper = await mountReviewCleanupDialogWith(FAKE_OPERATION());
+        const wrapper = await mountReviewCleanupDialogWith(FAKE_OPERATION);
         await wrapper.find(SELECT_ALL_CHECKBOX).setChecked();
         await wrapper.find(DELETE_BUTTON).trigger("click");
-        const permanentlyDeleteBtn = findByText(wrapper, "button", /Permanently delete/);
         await wrapper.find(AGREEMENT_CHECKBOX).setChecked();
+        const allButtons = wrapper.findAll(".btn");
+        const permanentlyDeleteBtn = withNameFilter(allButtons).hasText("Permanently delete").at(0);
 
         expect(wrapper.emitted().onConfirmCleanupSelectedItems).toBeFalsy();
         await permanentlyDeleteBtn.trigger("click");
         expect(wrapper.emitted().onConfirmCleanupSelectedItems).toBeTruthy();
-        expect(wrapper.emitted().onConfirmCleanupSelectedItems.length).toBe(1);
+        expect(wrapper.emitted().onConfirmCleanupSelectedItems?.length).toBe(1);
     });
 
-    function findByText(wrap, selector, text) {
-        return wrap
-            .findAll(selector)
-            .filter((n) => n.text().match(text))
-            .at(0);
+    // From: https://github.com/vuejs/vue-test-utils/issues/960#issuecomment-626327505
+    function withNameFilter(wrapperArray: WrapperArray<Vue>) {
+        return {
+            childSelectorHasText: (selector: string, str: string): WrapperArray<Vue> =>
+                wrapperArray.filter((i) => i.find(selector).text().match(str)),
+
+            hasText: (str: string): WrapperArray<Vue> => wrapperArray.filter((i) => i.text().match(str)),
+        };
     }
 });
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.vue b/client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.vue
index be00ab6eb1e..4fb74b1abf0 100644
--- a/client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.vue
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/ReviewCleanupDialog.vue
@@ -1,11 +1,202 @@
+<script setup lang="ts">
+import localize from "@/utils/localization";
+import { bytesToString } from "@/utils/utils";
+import { BModal, BTable, BFormCheckbox, BLink, BPagination, BButton } from "bootstrap-vue";
+import UtcDate from "@/components/UtcDate.vue";
+import type { CleanableItem, CleanupOperation } from "./model";
+import { computed, ref, watch } from "vue";
+
+interface ReviewCleanupDialogProps {
+    operation?: CleanupOperation;
+    totalItems?: number;
+    modalStatic?: boolean;
+}
+
+const props = withDefaults(defineProps<ReviewCleanupDialogProps>(), {
+    operation: undefined,
+    totalItems: 0,
+});
+
+const emit = defineEmits<{
+    (event: "onConfirmCleanupSelectedItems", items: CleanableItem[]): void;
+}>();
+
+const permanentlyDeleteText = localize("Permanently delete");
+const captionText = localize("To free up account space, review and select items to be permanently deleted or");
+const agreementText = localize("I understand that once I delete the items, they cannot be recovered.");
+const fields = [
+    {
+        key: "selected",
+        label: "",
+        sortable: false,
+    },
+    {
+        key: "name",
+        sortable: true,
+    },
+    {
+        key: "size",
+        sortable: true,
+        formatter: toNiceSize,
+    },
+    {
+        label: "Updated",
+        key: "update_time",
+        sortable: true,
+    },
+];
+
+type SortableKey = "name" | "size" | "update_time";
+
+const sortBy = ref(<SortableKey>"size");
+const sortDesc = ref(true);
+const perPage = ref(50);
+const currentPage = ref(1);
+const totalRows = ref(1);
+const allSelected = ref(false);
+const indeterminate = ref(false);
+const showDialog = ref(false);
+const items = ref<CleanableItem[]>([]);
+const selectedItems = ref<CleanableItem[]>([]);
+const itemLimit = ref(500);
+const confirmChecked = ref(false);
+const isBusy = ref(false);
+
+const selectedItemCount = computed(() => {
+    return selectedItems.value.length;
+});
+
+const hasItemsSelected = computed(() => {
+    return selectedItemCount.value > 0;
+});
+
+const hasPages = computed(() => {
+    return totalRows.value > perPage.value;
+});
+
+const title = computed(() => {
+    return props.operation?.name ?? "";
+});
+
+const confirmationTitle = computed(() => {
+    return `Permanently delete ${selectedItemCount.value} items?`;
+});
+
+const deleteButtonVariant = computed(() => {
+    return hasItemsSelected.value ? "danger" : "";
+});
+
+const deleteItemsText = computed(() => {
+    return hasItemsSelected.value ? `${selectedItemCount.value} items` : "";
+});
+
+const confirmButtonVariant = computed(() => {
+    return confirmChecked.value ? "danger" : "";
+});
+
+const rowLimitReached = computed(() => {
+    return totalRows.value >= itemLimit.value;
+});
+
+const rowLimitReachedText = computed(() => {
+    return localize(
+        `Displaying a maximum of ${itemLimit.value} items here. If there are more, you can rerun this operation after deleting some.`
+    );
+});
+
+watch(props, (newVal) => {
+    currentPage.value = 1;
+    totalRows.value = newVal.totalItems;
+});
+
+watch(selectedItems, (newVal) => {
+    if (newVal.length === 0) {
+        indeterminate.value = false;
+        allSelected.value = false;
+    } else if (newVal.length === items.value.length) {
+        indeterminate.value = false;
+        allSelected.value = true;
+    } else {
+        indeterminate.value = true;
+        allSelected.value = false;
+    }
+});
+
+function toNiceSize(sizeInBytes: number) {
+    return bytesToString(sizeInBytes, true, undefined);
+}
+
+function toggleSelectAll(checked: boolean) {
+    selectedItems.value = checked ? items.value : [];
+}
+
+function openModal() {
+    showDialog.value = true;
+}
+
+function hideModal() {
+    showDialog.value = false;
+}
+
+function onShowModal() {
+    resetModal();
+}
+
+function resetModal() {
+    selectedItems.value = [];
+}
+
+function resetConfirmationModal() {
+    confirmChecked.value = false;
+}
+
+function onConfirmCleanupSelectedItems() {
+    emit("onConfirmCleanupSelectedItems", selectedItems.value);
+    hideModal();
+}
+
+function onSort(props: { sortBy: SortableKey; sortDesc: boolean }) {
+    sortBy.value = props.sortBy;
+    sortDesc.value = props.sortDesc;
+}
+
+async function itemsProvider(ctx: { currentPage: number; perPage: number }) {
+    try {
+        const page = ctx.currentPage > 0 ? ctx.currentPage - 1 : 0;
+        const offset = page * ctx.perPage;
+        const options = {
+            offset: offset,
+            limit: ctx.perPage,
+            sortBy: sortBy.value,
+            sortDesc: sortDesc.value,
+        };
+        const result = await props.operation.fetchItems(options);
+        return result;
+    } catch (error) {
+        return [];
+    }
+}
+
+async function onSelectAllItems() {
+    isBusy.value = true;
+    const allItems = await props.operation.fetchItems({
+        offset: 0,
+        limit: totalRows.value,
+        sortBy: sortBy.value,
+        sortDesc: sortDesc.value,
+    });
+    selectedItems.value = allItems;
+    isBusy.value = false;
+}
+
+defineExpose({
+    openModal,
+    selectedItems,
+});
+</script>
+
 <template>
-    <b-modal
-        id="review-cleanup-dialog"
-        v-model="showDialog"
-        title-tag="h2"
-        :static="modalStatic"
-        centered
-        @show="onShowModal">
+    <b-modal v-model="showDialog" title-tag="h2" :static="modalStatic" centered @show="onShowModal">
         <template v-slot:modal-title>
             {{ title }}
             <span class="text-primary h3">{{ totalItems }}<span v-if="rowLimitReached">+</span> items</span>
@@ -38,11 +229,7 @@
                     @change="toggleSelectAll" />
             </template>
             <template v-slot:cell(selected)="data">
-                <b-form-checkbox
-                    :key="data.index"
-                    v-model="selectedItems"
-                    :checked="allSelected"
-                    :value="data.item"></b-form-checkbox>
+                <b-form-checkbox :key="data.index" v-model="selectedItems" :checked="allSelected" :value="data.item" />
             </template>
             <template v-slot:cell(update_time)="data">
                 <UtcDate :date="data.value" mode="elapsed" />
@@ -78,200 +265,3 @@
         </b-modal>
     </b-modal>
 </template>
-
-<script>
-import _l from "utils/localization";
-import { bytesToString } from "utils/utils";
-import UtcDate from "components/UtcDate";
-import { CleanupOperation } from "./model";
-
-export default {
-    components: {
-        UtcDate,
-    },
-    props: {
-        operation: {
-            type: CleanupOperation,
-            required: false,
-            default: null,
-        },
-        totalItems: {
-            type: Number,
-            required: false,
-            default: 0,
-        },
-        show: {
-            type: Boolean,
-            required: false,
-        },
-        modalStatic: {
-            type: Boolean,
-            required: false,
-        },
-    },
-    data() {
-        return {
-            fields: [
-                {
-                    key: "selected",
-                    label: "",
-                    sortable: false,
-                },
-                {
-                    key: "name",
-                    sortable: true,
-                },
-                {
-                    key: "size",
-                    sortable: true,
-                    formatter: this.toNiceSize,
-                },
-                {
-                    label: "Updated",
-                    key: "update_time",
-                    sortable: true,
-                },
-            ],
-            sortBy: "size",
-            sortDesc: true,
-            perPage: 50,
-            currentPage: 1,
-            totalRows: 1,
-            allSelected: false,
-            indeterminate: false,
-            showDialog: false,
-            items: [],
-            selectedItems: [],
-            itemLimit: 500,
-            confirmChecked: false,
-            permanentlyDeleteText: _l("Permanently delete"),
-            captionText: _l("To free up account space, review and select items to be permanently deleted or"),
-            agreementText: _l("I understand that once I delete the items, they cannot be recovered."),
-            isBusy: false,
-        };
-    },
-    computed: {
-        /** @returns {Number} */
-        selectedItemCount() {
-            return this.selectedItems.length;
-        },
-        /** @returns {Boolean} */
-        hasItemsSelected() {
-            return this.selectedItems.length > 0;
-        },
-        /** @returns {Boolean} */
-        hasPages() {
-            return this.totalRows > this.perPage;
-        },
-        /** @returns {String} */
-        title() {
-            return this.operation ? this.operation.name : "";
-        },
-        /** @returns {String} */
-        confirmationTitle() {
-            return `Permanently delete ${this.selectedItemCount} items?`;
-        },
-        /** @returns {String} */
-        deleteButtonVariant() {
-            return this.hasItemsSelected ? "danger" : "";
-        },
-        /** @returns {String} */
-        deleteItemsText() {
-            return this.hasItemsSelected ? `${this.selectedItemCount} items` : "";
-        },
-        /** @returns {String} */
-        confirmButtonVariant() {
-            return this.confirmChecked ? "danger" : "";
-        },
-        /** @returns {Boolean} */
-        rowLimitReached() {
-            return this.totalRows >= this.itemLimit;
-        },
-        /** @returns {String} */
-        rowLimitReachedText() {
-            return _l(
-                `Displaying a maximum of ${this.itemLimit} items here. If there are more, you can rerun this operation after deleting some.`
-            );
-        },
-    },
-    watch: {
-        operation() {
-            this.currentPage = 1;
-        },
-        totalItems(newVal) {
-            this.totalRows = newVal;
-        },
-        selectedItems(newVal) {
-            if (newVal.length === 0) {
-                this.indeterminate = false;
-                this.allSelected = false;
-            } else if (newVal.length === this.items.length) {
-                this.indeterminate = false;
-                this.allSelected = true;
-            } else {
-                this.indeterminate = true;
-                this.allSelected = false;
-            }
-        },
-    },
-    created() {
-        this.showDialog = this.show;
-    },
-    methods: {
-        toNiceSize(sizeInBytes) {
-            return bytesToString(sizeInBytes, true);
-        },
-        toggleSelectAll(checked) {
-            this.selectedItems = checked ? this.items : [];
-        },
-        hideModal() {
-            this.showDialog = false;
-        },
-        onShowModal() {
-            this.resetModal();
-        },
-        resetModal() {
-            this.selectedItems = [];
-        },
-        resetConfirmationModal() {
-            this.confirmChecked = false;
-        },
-        onConfirmCleanupSelectedItems() {
-            this.$emit("onConfirmCleanupSelectedItems", this.selectedItems);
-            this.hideModal();
-        },
-        onSort(props) {
-            this.sortBy = props.sortBy;
-            this.sortDesc = props.sortDesc;
-        },
-        async itemsProvider(ctx) {
-            try {
-                const page = ctx.currentPage > 0 ? ctx.currentPage - 1 : 0;
-                const offset = page * ctx.perPage;
-                const options = {
-                    offset: offset,
-                    limit: ctx.perPage,
-                    sortBy: this.sortBy,
-                    sortDesc: this.sortDesc,
-                };
-                const result = await this.operation.fetchItems(options);
-                return result;
-            } catch (error) {
-                return [];
-            }
-        },
-        async onSelectAllItems() {
-            this.isBusy = true;
-            const options = {
-                offset: 0,
-                limit: this.totalRows,
-                sortBy: this.sortBy,
-                sortDesc: this.sortDesc,
-            };
-            const allItems = await this.operation.fetchItems(options);
-            this.selectedItems = allItems;
-            this.isBusy = false;
-        },
-    },
-};
-</script>
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/categories.js b/client/src/components/User/DiskUsage/Management/Cleanup/categories.js
deleted file mode 100644
index 5007baca45b..00000000000
--- a/client/src/components/User/DiskUsage/Management/Cleanup/categories.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import _l from "utils/localization";
-import {
-    cleanupDatasets,
-    fetchDiscardedDatasets,
-    fetchDiscardedDatasetsSummary,
-    cleanupHistories,
-    fetchDiscardedHistories,
-    fetchDiscardedHistoriesSummary,
-} from "../services";
-
-export const cleanupCategories = [
-    {
-        name: _l("Discarded Items"),
-        operations: [
-            {
-                id: "deleted_datasets",
-                name: _l("Deleted datasets"),
-                description: _l(
-                    "When you delete a dataset it's not immediately removed from the disk (so you can recover it later)." +
-                        " But this means it's still taking space until you permanently delete it." +
-                        " Here you can quickly find and remove those datasets to free up some space"
-                ),
-                fetchSummary: fetchDiscardedDatasetsSummary,
-                fetchItems: fetchDiscardedDatasets,
-                cleanupItems: cleanupDatasets,
-            },
-            {
-                id: "deleted_histories",
-                name: _l("Deleted histories"),
-                description: _l(
-                    "When you delete a history it's not immediately removed from the disk (so you can recover it later)." +
-                        " But this means it's still taking space until you permanently delete it." +
-                        " Here you can quickly find and remove those histories to free up some space"
-                ),
-                fetchSummary: fetchDiscardedHistoriesSummary,
-                fetchItems: fetchDiscardedHistories,
-                cleanupItems: cleanupHistories,
-            },
-        ],
-    },
-];
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/categories.ts b/client/src/components/User/DiskUsage/Management/Cleanup/categories.ts
new file mode 100644
index 00000000000..6274ceb4c7b
--- /dev/null
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/categories.ts
@@ -0,0 +1,48 @@
+import localize from "@/utils/localization";
+import { ref } from "vue";
+import {
+    cleanupDiscardedDatasets,
+    fetchDiscardedDatasets,
+    fetchDiscardedDatasetsSummary,
+    cleanupDiscardedHistories,
+    fetchDiscardedHistories,
+    fetchDiscardedHistoriesSummary,
+} from "../services";
+import type { CleanupCategory } from "./model";
+
+export function useCleanupCategories() {
+    const cleanupCategories = ref<CleanupCategory[]>([
+        {
+            id: "discarded_items",
+            name: localize("Discarded Items"),
+            operations: [
+                {
+                    id: "deleted_datasets",
+                    name: localize("Deleted datasets"),
+                    description: localize(
+                        "When you delete a dataset it's not immediately removed from the disk (so you can recover it later)." +
+                            " But this means it's still taking space until you permanently delete it." +
+                            " Here you can quickly find and remove those datasets to free up some space"
+                    ),
+                    fetchSummary: fetchDiscardedDatasetsSummary,
+                    fetchItems: fetchDiscardedDatasets,
+                    cleanupItems: cleanupDiscardedDatasets,
+                },
+                {
+                    id: "deleted_histories",
+                    name: localize("Deleted histories"),
+                    description: localize(
+                        "When you delete a history it's not immediately removed from the disk (so you can recover it later)." +
+                            " But this means it's still taking space until you permanently delete it." +
+                            " Here you can quickly find and remove those histories to free up some space"
+                    ),
+                    fetchSummary: fetchDiscardedHistoriesSummary,
+                    fetchItems: fetchDiscardedHistories,
+                    cleanupItems: cleanupDiscardedHistories,
+                },
+            ],
+        },
+    ]);
+
+    return { cleanupCategories };
+}
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/cleanupCategoriesProvider.js b/client/src/components/User/DiskUsage/Management/Cleanup/cleanupCategoriesProvider.js
deleted file mode 100644
index d53bbc56e13..00000000000
--- a/client/src/components/User/DiskUsage/Management/Cleanup/cleanupCategoriesProvider.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { cleanupCategories } from "./categories";
-import { CleanupCategory } from "./model";
-
-export default {
-    created() {
-        this.categories = this.loadCategories();
-    },
-    data() {
-        return {
-            categories: [],
-        };
-    },
-    methods: {
-        loadCategories() {
-            return cleanupCategories.map((category) => new CleanupCategory(category));
-        },
-    },
-    render() {
-        return this.$scopedSlots.default({
-            categories: this.categories,
-        });
-    },
-};
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/index.js b/client/src/components/User/DiskUsage/Management/Cleanup/index.js
deleted file mode 100644
index 15496b37911..00000000000
--- a/client/src/components/User/DiskUsage/Management/Cleanup/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { CleanupCategoriesProvider } from "./cleanupCategoriesProvider";
-export { CleanupOperationSummary } from "./CleanupOperationSummary";
-export { CleanupResultDialog } from "./CleanupResultDialog";
-export { ReviewCleanupDialog } from "./ReviewCleanupDialog";
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanableSummary.js b/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanableSummary.ts
similarity index 54%
rename from client/src/components/User/DiskUsage/Management/Cleanup/model/CleanableSummary.js
rename to client/src/components/User/DiskUsage/Management/Cleanup/model/CleanableSummary.ts
index 7e81e0d0645..d61d3708460 100644
--- a/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanableSummary.js
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanableSummary.ts
@@ -1,35 +1,41 @@
-import { bytesToString } from "utils/utils";
+import { bytesToString } from "@/utils/utils";
+
+interface SummaryDataResponse {
+    totalSize: number;
+    totalItems: number;
+}
 
 /**
  * Contains summary information about how much storage space can be recovered by removing
  * a collection of items from it.
  */
 export class CleanableSummary {
-    constructor(data) {
-        this._totalSize = data.totalSize;
-        this._totalItems = data.totalItems;
+    private _data: SummaryDataResponse;
+
+    constructor(data: SummaryDataResponse) {
+        this._data = data;
     }
 
     /**
      * The total size in bytes that can be recovered by removing all the items.
      * @returns {Number}
      */
-    get totalSize() {
-        return this._totalSize;
+    get totalSize(): number {
+        return this._data.totalSize;
     }
 
     /**
      * The human readable total amount of disk space that can be recovered.
      * @returns {String}
      */
-    get niceTotalSize() {
-        return bytesToString(this.totalSize, true);
+    get niceTotalSize(): string {
+        return bytesToString(this.totalSize, true, undefined);
     }
 
     /**
      * The total number of items that could be removed.
      */
     get totalItems() {
-        return this._totalItems;
+        return this._data.totalItems;
     }
 }
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupCategory.js b/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupCategory.js
deleted file mode 100644
index 281791fa3f4..00000000000
--- a/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupCategory.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { CleanupOperation } from ".";
-
-export class CleanupCategory {
-    constructor(data) {
-        this._id = data.id;
-        this._name = data.name;
-        this._operations = data.operations.map((op) => new CleanupOperation(op));
-    }
-
-    /**
-     * The ID of this category.
-     * @returns {String}
-     */
-    get id() {
-        return this._id;
-    }
-
-    /**
-     * The name of this category.
-     * @returns {String}
-     */
-    get name() {
-        return this._name;
-    }
-
-    /**
-     * The collection of cleanup operations associated with
-     * this category.
-     */
-    get operations() {
-        return this._operations;
-    }
-}
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupCategory.ts b/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupCategory.ts
new file mode 100644
index 00000000000..a7ed4d62059
--- /dev/null
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupCategory.ts
@@ -0,0 +1,22 @@
+import type { CleanupOperation } from ".";
+
+/**
+ * Defines a new category to display in the Storage Management Dashboard to
+ * to provide a set of cleanup operations to free-up some storage space.
+ */
+export interface CleanupCategory {
+    /**
+     * The ID of this category.
+     */
+    id: string;
+
+    /**
+     * The name of this category.
+     */
+    name: string;
+
+    /**
+     * The list of available cleanup operations associated with this category.
+     */
+    operations: CleanupOperation[];
+}
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupOperation.js b/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupOperation.js
deleted file mode 100644
index ce40dfa3cfd..00000000000
--- a/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupOperation.js
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Represents an operation that can potentially `clean` the user storage.
- * The concept of `cleaning` here refers to any action that can free up
- * some space in the user storage.
- */
-export class CleanupOperation {
-    constructor(data) {
-        this._id = data.id;
-        this._name = data.name;
-        this._description = data.description;
-        this._fetchSummary = data.fetchSummary;
-        this._fetchItems = data.fetchItems;
-        this._cleanupItems = data.cleanupItems;
-    }
-
-    /**
-     * The ID of this cleanup operation.
-     * @returns {String}
-     */
-    get id() {
-        return this._id;
-    }
-
-    /**
-     * The name of this cleanup operation.
-     * @returns {String}
-     */
-    get name() {
-        return this._name;
-    }
-
-    /**
-     * The description of this cleanup operation.
-     * @returns {String}
-     */
-    get description() {
-        return this._description;
-    }
-
-    /**
-     * Fetches summary information about the total amount of
-     * space that can be cleaned/recovered using this operation.
-     * @returns {Promise<CleanableSummary>}
-     */
-    async fetchSummary() {
-        return await this._fetchSummary();
-    }
-
-    /**
-     * Fetches an array of items that can be potentially `cleaned` by this operation.
-     * @param {Object} filterOptions The filter options for sorting and pagination of the items.
-     * @returns {Promise<Array<Item>>} An array of items that can be potentially `cleaned` and match the filtering params.
-     */
-    async fetchItems(filterOptions) {
-        return await this._fetchItems(filterOptions);
-    }
-
-    /**
-     * Processes the given items to free up some user storage space and provides a result
-     * indicating how much was space was recovered or what errors may have ocurred.
-     * @param {Array<Item>} items An array of items to be `cleaned`
-     * @returns {Promise<CleanupResult>} The result of the cleanup operation.
-     */
-    async cleanupItems(items) {
-        return await this._cleanupItems(items);
-    }
-}
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupOperation.ts b/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupOperation.ts
new file mode 100644
index 00000000000..e4b9055a76f
--- /dev/null
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupOperation.ts
@@ -0,0 +1,58 @@
+import type { CleanableSummary } from "./CleanableSummary";
+import type { CleanupResult } from "./CleanupResult";
+
+export interface PaginationOptions {
+    limit?: number;
+    offset?: number;
+    sortBy?: string;
+    sortDesc?: boolean;
+}
+
+export interface CleanableItem {
+    id: string;
+    name: string;
+    size: number;
+}
+
+/**
+ * Represents an operation that can potentially `clean` the user storage.
+ * The concept of `cleaning` here refers to any action that can free up
+ * some space in the user storage.
+ */
+export interface CleanupOperation {
+    /**
+     * The ID of this cleanup operation.
+     */
+    id: string;
+
+    /**
+     * The name of this cleanup operation.
+     */
+    name: string;
+
+    /**
+     * The description of this cleanup operation.
+     */
+    description: string;
+
+    /**
+     * Fetches summary information about the total amount of
+     * space that can be cleaned/recovered using this operation.
+     */
+    fetchSummary: () => Promise<CleanableSummary>;
+
+    /**
+     * Fetches an array of items that can be potentially `cleaned` by this operation.
+     * @param options The filter options for sorting and pagination of the items.
+     * @returns An array of items that can be potentially `cleaned` and match the filtering params.
+     */
+    fetchItems: (options: PaginationOptions) => Promise<CleanableItem[]>;
+
+    /**
+     * Processes the given items to free up some user storage space and provides a result
+     * indicating how much was space was recovered or what errors may have ocurred.
+     * @param items An array of items to be `cleaned`
+     * @returns The result of the cleanup operation.
+     */
+    cleanupItems: (items: CleanableItem[]) => Promise<CleanupResult>;
+}
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupResult.js b/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupResult.js
deleted file mode 100644
index baf3aa6514c..00000000000
--- a/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupResult.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import { bytesToString } from "utils/utils";
-
-/**
- * Contains information about the result of the cleaning operation.
- */
-export class CleanupResult {
-    constructor(props = {}) {
-        this.totalItemCount = props.totalItemCount || 0;
-        this.totalFreeBytes = props.totalFreeBytes || 0;
-        this.errors = props.errors || [];
-        this.errorMessage = props.errorMessage || null;
-    }
-
-    /**
-     * Whether the cleanup operation yielded some errors.
-     * It doesn't mean the operation completely failed.
-     * @returns {boolean}
-     */
-    get hasSomeErrors() {
-        return this.errors.length > 0;
-    }
-
-    /**
-     * Whether the cleanup operation completely failed.
-     * This means not even partial cleaning was made.
-     * @returns {boolean}
-     */
-    get hasFailed() {
-        return this.errorMessage !== null;
-    }
-
-    /**
-     * Whether the cleanup operation was executed without errors.
-     * @returns {boolean}
-     */
-    get success() {
-        return !this.hasSomeErrors && !this.errorMessage;
-    }
-
-    /**
-     * The number of items successfully cleaned.
-     * @returns {number}
-     */
-    get totalCleaned() {
-        return this.totalItemCount - this.errors.length;
-    }
-
-    /**
-     * Whether the cleanup operation managed to
-     * free some items but not all of them.
-     * @returns {boolean}
-     */
-    get isPartialSuccess() {
-        return this.errors.length > 0 && this.totalCleaned > 0;
-    }
-
-    /**
-     * The total amount of disk space freed by the cleanup operation.
-     * @returns {String}
-     */
-    get niceTotalFreeBytes() {
-        return bytesToString(this.totalFreeBytes, true);
-    }
-}
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupResult.ts b/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupResult.ts
new file mode 100644
index 00000000000..7d7be5dfa3b
--- /dev/null
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/model/CleanupResult.ts
@@ -0,0 +1,91 @@
+import { bytesToString } from "@/utils/utils";
+
+export interface ItemError {
+    name: string;
+    reason: string;
+}
+
+export interface CleanupResultResponse {
+    totalItemCount: number;
+    totalFreeBytes: number;
+    errors: ItemError[];
+    errorMessage?: string;
+}
+
+/**
+ * Contains information about the result of the cleaning operation.
+ */
+export class CleanupResult {
+    private _data: CleanupResultResponse;
+
+    constructor(data: CleanupResultResponse = { totalFreeBytes: 0, totalItemCount: 0, errors: [] }) {
+        this._data = data;
+    }
+
+    get totalItemCount(): number {
+        return this._data.totalItemCount;
+    }
+
+    get totalFreeBytes(): number {
+        return this._data.totalFreeBytes;
+    }
+
+    get errors(): ItemError[] {
+        return this._data.errors;
+    }
+
+    get errorMessage(): string | undefined {
+        return this._data.errorMessage;
+    }
+
+    /**
+     * Whether the cleanup operation yielded some errors.
+     * It doesn't mean the operation completely failed.
+     * @returns {boolean}
+     */
+    get hasSomeErrors(): boolean {
+        return this._data.errors.length > 0;
+    }
+
+    /**
+     * Whether the cleanup operation completely failed.
+     * This means not even partial cleaning was made.
+     * @returns {boolean}
+     */
+    get hasFailed(): boolean {
+        return Boolean(this._data.errorMessage);
+    }
+
+    /**
+     * Whether the cleanup operation was executed without errors.
+     * @returns {boolean}
+     */
+    get success(): boolean {
+        return !this.hasSomeErrors && !this._data.errorMessage;
+    }
+
+    /**
+     * The number of items successfully cleaned.
+     * @returns {number}
+     */
+    get totalCleaned(): number {
+        return this._data.totalItemCount - this._data.errors.length;
+    }
+
+    /**
+     * Whether the cleanup operation managed to
+     * free some items but not all of them.
+     * @returns {boolean}
+     */
+    get isPartialSuccess(): boolean {
+        return this._data.errors.length > 0 && this.totalCleaned > 0;
+    }
+
+    /**
+     * The total amount of disk space freed by the cleanup operation.
+     * @returns {String}
+     */
+    get niceTotalFreeBytes(): string {
+        return bytesToString(this._data.totalFreeBytes, true, undefined);
+    }
+}
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/model/index.js b/client/src/components/User/DiskUsage/Management/Cleanup/model/index.js
deleted file mode 100644
index e4a6554677d..00000000000
--- a/client/src/components/User/DiskUsage/Management/Cleanup/model/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export { CleanableSummary } from "./CleanableSummary";
-export { CleanupCategory } from "./CleanupCategory";
-export { CleanupOperation } from "./CleanupOperation";
-export { CleanupResult } from "./CleanupResult";
diff --git a/client/src/components/User/DiskUsage/Management/Cleanup/model/index.ts b/client/src/components/User/DiskUsage/Management/Cleanup/model/index.ts
new file mode 100644
index 00000000000..74850c16e6f
--- /dev/null
+++ b/client/src/components/User/DiskUsage/Management/Cleanup/model/index.ts
@@ -0,0 +1,4 @@
+export { CleanableSummary } from "./CleanableSummary";
+export type { CleanupCategory } from "./CleanupCategory";
+export type { CleanableItem, CleanupOperation, PaginationOptions } from "./CleanupOperation";
+export { CleanupResult, type CleanupResultResponse, type ItemError } from "./CleanupResult";
diff --git a/client/src/components/User/DiskUsage/Management/StorageManager.vue b/client/src/components/User/DiskUsage/Management/StorageManager.vue
index 642cd19bf64..927363f2223 100644
--- a/client/src/components/User/DiskUsage/Management/StorageManager.vue
+++ b/client/src/components/User/DiskUsage/Management/StorageManager.vue
@@ -1,107 +1,101 @@
+<script setup lang="ts">
+import localize from "@/utils/localization";
+import { delay } from "@/utils/utils";
+import CleanupOperationSummary from "./Cleanup/CleanupOperationSummary.vue";
+import CleanupResultDialog from "./Cleanup/CleanupResultDialog.vue";
+import ReviewCleanupDialog from "./Cleanup/ReviewCleanupDialog.vue";
+import { useCleanupCategories } from "./Cleanup/categories";
+import { useConfig } from "@/composables/config";
+import { ref } from "vue";
+import type { CleanableItem, CleanupOperation, CleanupResult } from "./Cleanup/model";
+
+interface ModalDialog {
+    openModal: () => void;
+}
+
+const { config } = useConfig();
+const { cleanupCategories } = useCleanupCategories();
+
+const currentOperation = ref<CleanupOperation>();
+const currentTotalItems = ref(0);
+const cleanupResult = ref<CleanupResult>();
+const refreshOperationId = ref<string>();
+
+const reviewModal = ref<ModalDialog | null>(null);
+const resultModal = ref<ModalDialog | null>(null);
+
+const issuesUrl = "https://github.com/galaxyproject/galaxy/issues";
+
+function onReviewItems(operation: CleanupOperation, totalItems: number) {
+    currentOperation.value = operation;
+    currentTotalItems.value = totalItems;
+    refreshOperationId.value = undefined;
+    reviewModal.value?.openModal();
+}
+
+async function onConfirmCleanupSelected(selectedItems: CleanableItem[]) {
+    cleanupResult.value = undefined;
+    resultModal.value?.openModal();
+    await delay(1000);
+    if (currentOperation.value) {
+        cleanupResult.value = await currentOperation.value.cleanupItems(selectedItems);
+        if (cleanupResult.value.success) {
+            refreshOperationId.value = currentOperation.value.id.toString();
+        }
+    }
+}
+</script>
+
 <template>
-    <ConfigProvider v-slot="{ config }">
-        <b-container fluid>
-            <b-link to="StorageDashboard">{{ goBackText }}</b-link>
-            <h2 class="text-center my-3">
-                <b>{{ title }}</b> <sup class="text-beta">(Beta)</sup>
-            </h2>
+    <b-container fluid>
+        <b-link to="StorageDashboard">{{ localize("Back to Dashboard") }}</b-link>
+        <h2 class="text-center my-3">
+            <b>{{ localize("Manage your account storage") }}</b> <sup class="text-beta">(Beta)</sup>
+        </h2>
 
-            <b-row class="justify-content-md-center">
-                <b-alert show dismissible variant="warning">
-                    {{ betaText }}
-                    <b-link :href="issuesUrl" target="_blank">here</b-link>.
-                </b-alert>
-            </b-row>
-            <b-row class="justify-content-md-center mb-5">
-                <b-alert v-if="config.enable_quotas" show>
-                    {{ whatCountsText }}
-                    <b-link :href="config.quota_url" target="_blank">{{ learnMoreText }}</b-link>
-                </b-alert>
-            </b-row>
+        <b-row class="justify-content-md-center">
+            <b-alert show dismissible variant="warning">
+                {{ localize("This feature is currently in Beta, if you find any issues please report them") }}
+                <b-link :href="issuesUrl" target="_blank">here</b-link>.
+            </b-alert>
+        </b-row>
+        <b-row class="justify-content-md-center mb-5">
+            <b-alert v-if="config.enable_quotas" show>
+                {{ localize("The storage manager only shows elements that count towards your disk quota.") }}
+                <b-link :href="config.quota_url" target="_blank">{{ localize("Learn more") }}</b-link>
+            </b-alert>
+        </b-row>
 
-            <CleanupCategoriesProvider v-slot="{ categories }">
-                <div id="categories-panel">
-                    <b-container v-for="category in categories" :key="category.id">
-                        <b-row class="justify-content-md-center mb-2">
-                            <h3>
-                                <b>{{ category.name }}</b>
-                            </h3>
-                        </b-row>
-                        <b-row class="justify-content-md-center mb-5">
-                            <b-card-group deck>
-                                <CleanupOperationSummary
-                                    v-for="operation in category.operations"
-                                    :key="operation.id"
-                                    :operation="operation"
-                                    :refresh-operation-id="refreshOperationId"
-                                    @onReviewItems="onReviewItems" />
-                            </b-card-group>
-                        </b-row>
-                    </b-container>
-                </div>
-            </CleanupCategoriesProvider>
+        <div id="categories-panel">
+            <b-container v-for="category in cleanupCategories" :key="category.id">
+                <b-row class="justify-content-md-center mb-2">
+                    <h3>
+                        <b>{{ category.name }}</b>
+                    </h3>
+                </b-row>
+                <b-row class="justify-content-md-center mb-5">
+                    <b-card-group deck>
+                        <CleanupOperationSummary
+                            v-for="operation in category.operations"
+                            :key="operation.id"
+                            :operation="operation"
+                            :refresh-operation-id="refreshOperationId"
+                            @onReviewItems="onReviewItems" />
+                    </b-card-group>
+                </b-row>
+            </b-container>
+        </div>
 
-            <ReviewCleanupDialog
-                :operation="currentOperation"
-                :total-items="currentTotalItems"
-                @onConfirmCleanupSelectedItems="onConfirmCleanupSelected" />
+        <ReviewCleanupDialog
+            ref="reviewModal"
+            :operation="currentOperation"
+            :total-items="currentTotalItems"
+            @onConfirmCleanupSelectedItems="onConfirmCleanupSelected" />
 
-            <CleanupResultDialog :result="cleanupResult" />
-        </b-container>
-    </ConfigProvider>
+        <CleanupResultDialog ref="resultModal" :result="cleanupResult" />
+    </b-container>
 </template>
 
-<script>
-import _l from "utils/localization";
-import { delay } from "utils/utils";
-import ConfigProvider from "components/providers/ConfigProvider";
-import CleanupCategoriesProvider from "./Cleanup/cleanupCategoriesProvider";
-import CleanupOperationSummary from "./Cleanup/CleanupOperationSummary";
-import CleanupResultDialog from "./Cleanup/CleanupResultDialog";
-import ReviewCleanupDialog from "./Cleanup/ReviewCleanupDialog";
-
-export default {
-    components: {
-        ConfigProvider,
-        CleanupOperationSummary,
-        ReviewCleanupDialog,
-        CleanupResultDialog,
-        CleanupCategoriesProvider,
-    },
-    data() {
-        return {
-            goBackText: _l("Back to Dashboard"),
-            title: _l("Manage your account storage"),
-            whatCountsText: _l("The storage manager only shows elements that count towards your disk quota."),
-            learnMoreText: _l("Learn more"),
-            betaText: _l("This feature is currently in Beta, if you find any issues please report them"),
-            issuesUrl: "https://github.com/galaxyproject/galaxy/issues",
-            errorMessage: null,
-            currentOperation: null,
-            currentTotalItems: 0,
-            cleanupResult: null,
-            refreshOperationId: null,
-        };
-    },
-    methods: {
-        onReviewItems(operation, totalItems) {
-            this.currentOperation = operation;
-            this.currentTotalItems = totalItems;
-            this.refreshOperationId = null;
-            this.$bvModal.show("review-cleanup-dialog");
-        },
-        async onConfirmCleanupSelected(items) {
-            this.cleanupResult = null;
-            this.$bvModal.show("cleanup-result-modal");
-            await delay(1000);
-            this.cleanupResult = await this.currentOperation.cleanupItems(items);
-            if (this.cleanupResult.success) {
-                this.refreshOperationId = this.currentOperation.id.toString();
-            }
-        },
-    },
-};
-</script>
 <style lang="css" scoped>
 .text-beta {
     color: #717273;
diff --git a/client/src/components/User/DiskUsage/Management/services.js b/client/src/components/User/DiskUsage/Management/services.ts
similarity index 52%
rename from client/src/components/User/DiskUsage/Management/services.js
rename to client/src/components/User/DiskUsage/Management/services.ts
index 7aabd69ecba..111869691d3 100644
--- a/client/src/components/User/DiskUsage/Management/services.js
+++ b/client/src/components/User/DiskUsage/Management/services.ts
@@ -1,7 +1,14 @@
+import { getAppRoot } from "@/onload/loadConfig";
+import { rethrowSimple } from "@/utils/simple-error";
 import axios from "axios";
-import { getAppRoot } from "onload/loadConfig";
-import { rethrowSimple } from "utils/simple-error";
-import { CleanableSummary, CleanupResult } from "./Cleanup/model";
+import {
+    CleanableSummary,
+    CleanupResult,
+    type CleanableItem,
+    type CleanupResultResponse,
+    type ItemError,
+    type PaginationOptions,
+} from "./Cleanup/model";
 
 const datasetKeys = "id,name,size,update_time,hda_ldda";
 const isDataset = "q=history_content_type-eq&qv=dataset";
@@ -13,19 +20,43 @@ const discardedDatasetsQueryParams = `${isDataset}&${isDeleted}&${isNotPurged}&l
 const historyKeys = "id,name,size,update_time";
 const discardedHistoriesQueryParams = `&${isDeleted}&${isNotPurged}&limit=${maxItemsToFetch}`;
 
+interface DiscardedDataset extends CleanableItem {
+    hda_ldda: string;
+}
+
+interface DatasetSourceId {
+    id: string;
+    src: string;
+}
+
+interface DatasetErrorMessage {
+    dataset: DatasetSourceId;
+    error_message: string;
+}
+
+interface DeleteDatasetBatchResult {
+    success_count: number;
+    errors?: DatasetErrorMessage[];
+}
+
+type DiscardedHistory = CleanableItem;
+
 /**
  * Calculates the total amount of bytes that can be cleaned by permanently removing
  * deleted datasets.
- * @returns {CleanableSummary} Object containing information about how much can be cleaned.
+ * @returns Object containing information about how much can be cleaned.
  */
-export async function fetchDiscardedDatasetsSummary() {
+export async function fetchDiscardedDatasetsSummary(): Promise<CleanableSummary> {
     //TODO: possible optimization -> moving this to specific API endpoint so we don't have to parse
     //      potentially a huge number of items
     const summaryKeys = "size";
     const url = `${getAppRoot()}api/datasets?keys=${summaryKeys}&${discardedDatasetsQueryParams}`;
     try {
         const { data } = await axios.get(url);
-        const totalSizeInBytes = data.reduce((partial_sum, item) => partial_sum + item.size, 0);
+        const totalSizeInBytes = data.reduce(
+            (partial_sum: number, item: DiscardedDataset) => partial_sum + item.size,
+            0
+        );
         return new CleanableSummary({
             totalSize: totalSizeInBytes,
             totalItems: data.length,
@@ -37,10 +68,10 @@ export async function fetchDiscardedDatasetsSummary() {
 
 /**
  * Retrieves all deleted datasets of the current user that haven't been purged yet using pagination.
- * @param {Object} options Filtering options for pagination and sorting.
- * @returns {Array} Array of dataset objects with the fields defined in `datasetKeys` constant.
+ * @param options Filtering options for pagination and sorting.
+ * @returns Array of dataset objects with the fields defined in `datasetKeys` constant.
  */
-export async function fetchDiscardedDatasets(options = {}) {
+export async function fetchDiscardedDatasets(options: PaginationOptions = {}): Promise<DiscardedDataset[]> {
     let params = "";
     if (options.sortBy) {
         const sortPostfix = options.sortDesc ? "-dsc" : "-asc";
@@ -55,7 +86,7 @@ export async function fetchDiscardedDatasets(options = {}) {
     const url = `${getAppRoot()}api/datasets?keys=${datasetKeys}&${discardedDatasetsQueryParams}&${params}`;
     try {
         const { data } = await axios.get(url);
-        return data;
+        return data as DiscardedDataset[];
     } catch (e) {
         rethrowSimple(e);
     }
@@ -63,10 +94,10 @@ export async function fetchDiscardedDatasets(options = {}) {
 
 /**
  * Purges a collection of datasets.
- * @param {Array} datasetSourceIds Array of objects with datasets {id, src} to be purged.
- * @returns {Object} Result object with `success_count` and `errors`.
+ * @param datasetSourceIds Array of objects with datasets {id, src} to be purged.
+ * @returns Result object with `success_count` and `errors`.
  */
-export async function purgeDatasets(datasetSourceIds) {
+export async function purgeDatasets(datasetSourceIds: DatasetSourceId[]): Promise<DeleteDatasetBatchResult> {
     const payload = {
         purge: true,
         datasets: datasetSourceIds,
@@ -83,37 +114,46 @@ export async function purgeDatasets(datasetSourceIds) {
 /**
  * Purges a set of datasets instances (HDA, LDDA, ...) from disk and returns the total space freed in bytes
  * taking into account possible datasets that couldn't be deleted.
- * @param {Array} datasets Array of datasets to be removed from disk.
+ * @param items Array of datasets to be removed from disk.
  *                         Each dataset must contain `id` and `size`.
- * @returns {CleanupResult}
+ * @returns Information about the result of the cleanup operation.
  */
-export async function cleanupDatasets(datasets) {
-    const result = new CleanupResult();
+export async function cleanupDiscardedDatasets(items: CleanableItem[]): Promise<CleanupResult> {
+    const resultResponse: CleanupResultResponse = { errors: [], totalFreeBytes: 0, totalItemCount: 0 };
     try {
-        const datasetsTable = datasets.reduce((acc, item) => ((acc[item.id] = item), acc), {});
-        const datasetSourceIds = datasets.map((dataset) => {
+        const datasetsTable = items.reduce(
+            (acc: { [key: string]: CleanableItem }, item: CleanableItem) => ((acc[item.id] = item), acc),
+            {}
+        );
+        const datasetSourceIds: DatasetSourceId[] = items.map((item: CleanableItem) => {
+            const dataset = item as DiscardedDataset;
             return { id: dataset.id, src: dataset.hda_ldda };
         });
         const requestResult = await purgeDatasets(datasetSourceIds);
-        result.totalItemCount = datasets.length;
-        result.errors = mapErrors(datasetsTable, requestResult.errors);
-        const erroredIds = requestResult.errors.reduce((acc, error) => [...acc, error.dataset.id], []);
-        result.totalFreeBytes = datasetSourceIds.reduce(
-            (partial_sum, item) => partial_sum + (erroredIds.includes(item.id) ? 0 : datasetsTable[item.id].size),
-            0
-        );
+        resultResponse.totalItemCount = items.length;
+        if (requestResult.errors) {
+            resultResponse.errors = mapErrors(datasetsTable, requestResult.errors);
+            const erroredIds = requestResult.errors?.reduce((acc: string[], error) => [...acc, error.dataset.id], []);
+            resultResponse.totalFreeBytes = datasetSourceIds.reduce(
+                (partial_sum, item) => partial_sum + (erroredIds?.includes(item.id) ? 0 : datasetsTable[item.id].size),
+                0
+            );
+        }
     } catch (error) {
-        result.errorMessage = error;
+        resultResponse.errorMessage = error as string;
     }
-    return result;
+    return new CleanupResult(resultResponse);
 }
 
-export async function fetchDiscardedHistoriesSummary() {
+export async function fetchDiscardedHistoriesSummary(): Promise<CleanableSummary> {
     const summaryKeys = "size";
     const url = `${getAppRoot()}api/histories?keys=${summaryKeys}&${discardedHistoriesQueryParams}`;
     try {
         const { data } = await axios.get(url);
-        const totalSizeInBytes = data.reduce((partial_sum, item) => partial_sum + item.size, 0);
+        const totalSizeInBytes = data.reduce(
+            (partial_sum: number, item: DiscardedHistory) => partial_sum + item.size,
+            0
+        );
         return new CleanableSummary({
             totalSize: totalSizeInBytes,
             totalItems: data.length,
@@ -123,7 +163,7 @@ export async function fetchDiscardedHistoriesSummary() {
     }
 }
 
-export async function fetchDiscardedHistories(options = {}) {
+export async function fetchDiscardedHistories(options: PaginationOptions = {}): Promise<DiscardedHistory[]> {
     let params = "";
     if (options.sortBy) {
         const sortPostfix = options.sortDesc ? "-dsc" : "-asc";
@@ -138,13 +178,13 @@ export async function fetchDiscardedHistories(options = {}) {
     const url = `${getAppRoot()}api/histories?keys=${historyKeys}&${discardedHistoriesQueryParams}&${params}`;
     try {
         const { data } = await axios.get(url);
-        return data;
+        return data as DiscardedHistory[];
     } catch (e) {
         rethrowSimple(e);
     }
 }
 
-async function purgeHistory(historyId) {
+async function purgeHistory(historyId: string) {
     const payload = {
         purge: true,
     };
@@ -157,21 +197,23 @@ async function purgeHistory(historyId) {
     }
 }
 
-export async function cleanupHistories(histories) {
-    const result = new CleanupResult();
-    const historiesTable = histories.reduce((acc, item) => ((acc[item.id] = item), acc), {});
+export async function cleanupDiscardedHistories(histories: DiscardedHistory[]) {
+    const resultResponse: CleanupResultResponse = { errors: [], totalFreeBytes: 0, totalItemCount: 0 };
+    const historiesTable = histories.reduce(
+        (acc: { [key: string]: DiscardedHistory }, item: DiscardedHistory) => ((acc[item.id] = item), acc),
+        {}
+    );
     // TODO: Promise.all() and do this in parallel?  Or add a bulk delete endpoint?
     try {
         for (const history of histories) {
-            const requestResult = await purgeHistory(history.id);
-            console.debug(requestResult);
-            result.totalFreeBytes += historiesTable[history.id].size;
-            result.totalItemCount += 1;
+            await purgeHistory(history.id);
+            resultResponse.totalFreeBytes += historiesTable[history.id].size;
+            resultResponse.totalItemCount += 1;
         }
     } catch (error) {
-        result.errorMessage = error;
+        resultResponse.errorMessage = error as string;
     }
-    return result;
+    return new CleanupResult(resultResponse);
 }
 
 /**
@@ -180,7 +222,7 @@ export async function cleanupHistories(histories) {
  * @param errors List of errors associated with each dataset ID
  * @returns A list with the name of the dataset and the associated error message.
  */
-function mapErrors(datasetsTable, errors) {
+function mapErrors(datasetsTable: { [key: string]: CleanableItem }, errors: DatasetErrorMessage[]): ItemError[] {
     return errors.map((error) => {
         const name = datasetsTable[error.dataset.id].name;
         return { name: name, reason: error.error_message };
diff --git a/client/src/components/User/DiskUsage/Quota/QuotaUsageBar.test.js b/client/src/components/User/DiskUsage/Quota/QuotaUsageBar.test.ts
similarity index 68%
rename from client/src/components/User/DiskUsage/Quota/QuotaUsageBar.test.js
rename to client/src/components/User/DiskUsage/Quota/QuotaUsageBar.test.ts
index f78309e51cf..c03b16854ee 100644
--- a/client/src/components/User/DiskUsage/Quota/QuotaUsageBar.test.js
+++ b/client/src/components/User/DiskUsage/Quota/QuotaUsageBar.test.ts
@@ -1,31 +1,26 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
-import QuotaUsageBar from "./QuotaUsageBar";
+import { getLocalVue } from "tests/jest/helpers";
+import { QuotaUsage } from "./model";
+import QuotaUsageBar from "./QuotaUsageBar.vue";
 
 const localVue = getLocalVue();
 
-const NON_DEFAULT_QUOTA_USAGE = {
-    sourceLabel: "The label",
-    quotaInBytes: 68468436,
-    totalDiskUsageInBytes: 4546654,
-    quotaPercent: 20,
-    niceQuota: "X MB",
-    niceTotalDiskUsage: "Y MB",
-    isUnlimited: false,
-};
+const NON_DEFAULT_QUOTA_USAGE: QuotaUsage = new QuotaUsage({
+    quota_source_label: "The label",
+    quota_bytes: 68468436,
+    total_disk_usage: 4546654,
+    quota_percent: 20,
+});
 
-const UNLIMITED_USAGE = {
-    sourceLabel: "Unlimited",
-    quotaInBytes: null,
-    totalDiskUsageInBytes: 4546654,
-    quotaPercent: null,
-    niceQuota: "unlimited",
-    niceTotalDiskUsage: "Y MB",
-    isUnlimited: true,
-};
+const UNLIMITED_USAGE: QuotaUsage = new QuotaUsage({
+    quota_source_label: "Unlimited",
+    quota_bytes: undefined,
+    total_disk_usage: 4546654,
+    quota_percent: undefined,
+});
 
-function mountQuotaUsageBarWith(quotaUsage) {
-    const wrapper = mount(QuotaUsageBar, { propsData: { quotaUsage } }, localVue);
+function mountQuotaUsageBarWith(quotaUsage: QuotaUsage) {
+    const wrapper = mount(QuotaUsageBar, { propsData: { quotaUsage }, localVue });
     return wrapper;
 }
 
@@ -43,7 +38,7 @@ describe("QuotaUsageBar.vue", () => {
         const percentText = wrapper.find(".quota-percent-text");
         expect(wrapper.vm.quotaHasLimit).toBe(true);
         expect(percentText.exists()).toBe(true);
-        expect(percentText.text()).toContain(NON_DEFAULT_QUOTA_USAGE.quotaPercent.toString());
+        expect(percentText.text()).toContain(NON_DEFAULT_QUOTA_USAGE.quotaPercent?.toString());
     });
 
     it("should not show percentage when there is no quota limit", async () => {
diff --git a/client/src/components/User/DiskUsage/Quota/QuotaUsageBar.vue b/client/src/components/User/DiskUsage/Quota/QuotaUsageBar.vue
index 08a18c4d2e1..8b584ec3d8a 100644
--- a/client/src/components/User/DiskUsage/Quota/QuotaUsageBar.vue
+++ b/client/src/components/User/DiskUsage/Quota/QuotaUsageBar.vue
@@ -1,3 +1,44 @@
+<script setup lang="ts">
+import { computed, ref } from "vue";
+import localize from "@/utils/localization";
+import { DEFAULT_QUOTA_SOURCE_LABEL, QuotaUsage } from "./model/QuotaUsage";
+
+interface QuotaUsageBarProps {
+    quotaUsage: QuotaUsage;
+}
+
+const props = defineProps<QuotaUsageBarProps>();
+
+const storageSourceText = ref(localize("storage source"));
+const percentOfDiskQuotaUsedText = ref(localize("% of disk quota used"));
+
+const isDefaultQuota = computed(() => {
+    return props.quotaUsage.sourceLabel === DEFAULT_QUOTA_SOURCE_LABEL;
+});
+const quotaHasLimit = computed(() => {
+    return !props.quotaUsage.isUnlimited;
+});
+const progressVariant = computed(() => {
+    const percent = props.quotaUsage.quotaPercent;
+    if (percent === undefined) {
+        return "secondary";
+    }
+    if (percent < 50) {
+        return "success";
+    } else if (percent >= 50 && percent < 80) {
+        return "primary";
+    } else if (percent >= 80 && percent < 95) {
+        return "warning";
+    }
+    return "danger";
+});
+
+defineExpose({
+    isDefaultQuota,
+    quotaHasLimit,
+});
+</script>
+
 <template>
     <div class="quota-usage-bar w-75 mx-auto my-5">
         <h2 v-if="!isDefaultQuota" class="quota-storage-source">
@@ -16,45 +57,3 @@
         <b-progress :value="quotaUsage.quotaPercent" :variant="progressVariant" max="100" />
     </div>
 </template>
-
-<script>
-import _l from "utils/localization";
-import { DEFAULT_QUOTA_SOURCE_LABEL } from "./model/QuotaUsage";
-
-export default {
-    props: {
-        quotaUsage: {
-            type: Object,
-            required: true,
-        },
-    },
-    data() {
-        return {
-            storageSourceText: _l("storage source"),
-            percentOfDiskQuotaUsedText: _l("% of disk quota used"),
-        };
-    },
-    computed: {
-        /** @returns {Boolean} */
-        isDefaultQuota() {
-            return this.quotaUsage.sourceLabel === DEFAULT_QUOTA_SOURCE_LABEL;
-        },
-        /** @returns {Boolean} */
-        quotaHasLimit() {
-            return !this.quotaUsage.isUnlimited;
-        },
-        /** @returns {String} */
-        progressVariant() {
-            const percent = this.quotaUsage.quotaPercent;
-            if (percent < 50) {
-                return "success";
-            } else if (percent >= 50 && percent < 80) {
-                return "primary";
-            } else if (percent >= 80 && percent < 95) {
-                return "warning";
-            }
-            return "danger";
-        },
-    },
-};
-</script>
diff --git a/client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.test.js b/client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.test.js
deleted file mode 100644
index 5e5ac7cddb1..00000000000
--- a/client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.test.js
+++ /dev/null
@@ -1,63 +0,0 @@
-import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
-import QuotaUsageSummary from "./QuotaUsageSummary";
-
-const localVue = getLocalVue();
-
-const QUOTA_1_BYTES = 654846535;
-const QUOTA_2_BYTES = 68468436;
-
-const FAKE_QUOTA_USAGES_LIST = [
-    {
-        sourceLabel: "source 1",
-        quotaInBytes: QUOTA_1_BYTES,
-    },
-    {
-        sourceLabel: "source 2",
-        quotaInBytes: QUOTA_2_BYTES,
-    },
-    {
-        sourceLabel: "Unlimited source",
-        quotaInBytes: null,
-        isUnlimited: true,
-    },
-];
-
-function mountQuotaUsageSummaryWith(quotaUsages) {
-    const wrapper = shallowMount(QuotaUsageSummary, { propsData: { quotaUsages } }, localVue);
-    return wrapper;
-}
-
-describe("QuotaUsageSummary.vue", () => {
-    it("should calculate the total amount of quotas without the unlimited", () => {
-        const wrapper = mountQuotaUsageSummaryWith(FAKE_QUOTA_USAGES_LIST);
-        const expectedTotalBytes = QUOTA_1_BYTES + QUOTA_2_BYTES;
-
-        expect(wrapper.vm.totalQuota).toBe(expectedTotalBytes);
-    });
-
-    it("should display a quota bar for each quota", () => {
-        const wrapper = mountQuotaUsageSummaryWith(FAKE_QUOTA_USAGES_LIST);
-        const expectedNumberOfBars = FAKE_QUOTA_USAGES_LIST.length;
-
-        expect(wrapper.findAll("quotausagebar-stub").length).toBe(expectedNumberOfBars);
-    });
-
-    it("should display `unlimited` quota when all sources are unlimited", async () => {
-        const FAKE_UNLIMITED_QUOTA_USAGES = [
-            {
-                sourceLabel: "Unlimited source 1",
-                quotaInBytes: null,
-                isUnlimited: true,
-            },
-            {
-                sourceLabel: "Unlimited source 2",
-                quotaInBytes: null,
-                isUnlimited: true,
-            },
-        ];
-        const wrapper = mountQuotaUsageSummaryWith(FAKE_UNLIMITED_QUOTA_USAGES);
-        const summaryText = wrapper.find("h2").text();
-        expect(summaryText).toContain("unlimited");
-    });
-});
diff --git a/client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.test.ts b/client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.test.ts
new file mode 100644
index 00000000000..fcef2de33f9
--- /dev/null
+++ b/client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.test.ts
@@ -0,0 +1,66 @@
+import { shallowMount } from "@vue/test-utils";
+import { getLocalVue } from "tests/jest/helpers";
+import { QuotaUsage } from "./model";
+import QuotaUsageSummary from "./QuotaUsageSummary.vue";
+
+const localVue = getLocalVue();
+
+const QUOTA_1_BYTES = 654846535;
+const QUOTA_2_BYTES = 68468436;
+
+const FAKE_QUOTA_USAGES_LIST: QuotaUsage[] = [
+    new QuotaUsage({
+        quota_source_label: "source 1",
+        quota_bytes: QUOTA_1_BYTES,
+        total_disk_usage: QUOTA_1_BYTES,
+    }),
+    new QuotaUsage({
+        quota_source_label: "source 2",
+        quota_bytes: QUOTA_2_BYTES,
+        total_disk_usage: QUOTA_2_BYTES,
+    }),
+    new QuotaUsage({
+        quota_source_label: "Unlimited source",
+        quota_bytes: undefined,
+        total_disk_usage: 0,
+    }),
+];
+
+function mountQuotaUsageSummaryWith(quotaUsages: QuotaUsage[]) {
+    const wrapper = shallowMount(QuotaUsageSummary, { propsData: { quotaUsages }, localVue });
+    return wrapper;
+}
+
+describe("QuotaUsageSummary.vue", () => {
+    it("should calculate the total amount of quotas without the unlimited", () => {
+        const wrapper = mountQuotaUsageSummaryWith(FAKE_QUOTA_USAGES_LIST);
+        const expectedTotalBytes = QUOTA_1_BYTES + QUOTA_2_BYTES;
+
+        expect(wrapper.vm.totalQuotaInBytes).toBe(expectedTotalBytes);
+    });
+
+    it("should display a quota bar for each quota", () => {
+        const wrapper = mountQuotaUsageSummaryWith(FAKE_QUOTA_USAGES_LIST);
+        const expectedNumberOfBars = FAKE_QUOTA_USAGES_LIST.length;
+
+        expect(wrapper.findAll(".quota-usage-bar").length).toBe(expectedNumberOfBars);
+    });
+
+    it("should display `unlimited` quota when all sources are unlimited", async () => {
+        const FAKE_UNLIMITED_QUOTA_USAGES: QuotaUsage[] = [
+            new QuotaUsage({
+                quota_source_label: "Unlimited source 1",
+                quota_bytes: undefined,
+                total_disk_usage: QUOTA_1_BYTES,
+            }),
+            new QuotaUsage({
+                quota_source_label: "Unlimited source 2",
+                quota_bytes: undefined,
+                total_disk_usage: QUOTA_2_BYTES,
+            }),
+        ];
+        const wrapper = mountQuotaUsageSummaryWith(FAKE_UNLIMITED_QUOTA_USAGES);
+        const summaryText = wrapper.find("h2").text();
+        expect(summaryText).toContain("unlimited");
+    });
+});
diff --git a/client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.vue b/client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.vue
index f6badcf2414..b0cb3ed40e4 100644
--- a/client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.vue
+++ b/client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.vue
@@ -1,3 +1,34 @@
+<script setup lang="ts">
+import { bytesToString } from "@/utils/utils";
+import { computed } from "vue";
+import type { QuotaUsage } from "./model";
+import QuotaUsageBar from "./QuotaUsageBar.vue";
+
+interface QuotaUsageSummaryProps {
+    quotaUsages: QuotaUsage[];
+}
+
+const props = defineProps<QuotaUsageSummaryProps>();
+
+const totalQuotaInBytes = computed(() => {
+    const totalQuota = props.quotaUsages.reduce((acc, item) => acc + (item.quotaInBytes ?? 0), 0);
+    return totalQuota;
+});
+
+const niceTotalQuota = computed(() => {
+    return bytesToString(totalQuotaInBytes.value, true, undefined);
+});
+
+const allSourcesUnlimited = computed(() => {
+    const allUnlimited = props.quotaUsages.every((usage) => usage.isUnlimited);
+    return allUnlimited;
+});
+
+defineExpose({
+    totalQuotaInBytes,
+});
+</script>
+
 <template>
     <div class="quota-summary">
         <div class="text-center my-5">
@@ -16,41 +47,8 @@
             </div>
         </div>
 
-        <div v-for="quotaUsage in quotaUsages" :key="quotaUsage.sourceLabel">
-            <QuotaUsageBar :quota-usage="quotaUsage" />
+        <div v-for="quotaUsage in props.quotaUsages" :key="quotaUsage.sourceLabel">
+            <QuotaUsageBar :quota-usage="quotaUsage" class="quota-usage-bar" />
         </div>
     </div>
 </template>
-
-<script>
-import { bytesToString } from "utils/utils";
-import QuotaUsageBar from "./QuotaUsageBar";
-
-export default {
-    components: {
-        QuotaUsageBar,
-    },
-    props: {
-        quotaUsages: {
-            type: Array,
-            required: true,
-        },
-    },
-    computed: {
-        /** @returns {Number} */
-        totalQuota() {
-            const totalQuota = this.quotaUsages.reduce((acc, item) => acc + item.quotaInBytes, 0);
-            return totalQuota;
-        },
-        /** @returns {String} */
-        niceTotalQuota() {
-            return bytesToString(this.totalQuota, true);
-        },
-        /** @returns {Boolean} */
-        allSourcesUnlimited() {
-            const allUnlimited = this.quotaUsages.every((usage) => usage.isUnlimited);
-            return allUnlimited;
-        },
-    },
-};
-</script>
diff --git a/client/src/components/User/DiskUsage/Quota/model/QuotaUsage.test.js b/client/src/components/User/DiskUsage/Quota/model/QuotaUsage.test.ts
similarity index 78%
rename from client/src/components/User/DiskUsage/Quota/model/QuotaUsage.test.js
rename to client/src/components/User/DiskUsage/Quota/model/QuotaUsage.test.ts
index 0c647689685..134aaa510b0 100644
--- a/client/src/components/User/DiskUsage/Quota/model/QuotaUsage.test.js
+++ b/client/src/components/User/DiskUsage/Quota/model/QuotaUsage.test.ts
@@ -1,24 +1,24 @@
-import { DEFAULT_QUOTA_SOURCE_LABEL, QuotaUsage } from "./QuotaUsage";
+import { DEFAULT_QUOTA_SOURCE_LABEL, QuotaUsage, type QuotaUsageResponse } from "./QuotaUsage";
 
-const RAW_DEFAULT_QUOTA_USAGE = {
-    quota_source_label: null,
+const RAW_DEFAULT_QUOTA_USAGE: QuotaUsageResponse = {
+    quota_source_label: undefined,
     quota_bytes: 68468436,
     total_disk_usage: 4546654,
     quota_percent: 20,
 };
 
-const RAW_LIMITED_SOURCE_QUOTA_USAGE = {
+const RAW_LIMITED_SOURCE_QUOTA_USAGE: QuotaUsageResponse = {
     quota_source_label: "The source",
     quota_bytes: 68468436,
     total_disk_usage: 4546654,
     quota_percent: 20,
 };
 
-const RAW_UNLIMITED_SOURCE_QUOTA_USAGE = {
+const RAW_UNLIMITED_SOURCE_QUOTA_USAGE: QuotaUsageResponse = {
     quota_source_label: "The unlimited source",
-    quota_bytes: null,
+    quota_bytes: undefined,
     total_disk_usage: 4546654,
-    quota_percent: null,
+    quota_percent: undefined,
 };
 
 describe("QuotaUsage", () => {
diff --git a/client/src/components/User/DiskUsage/Quota/model/QuotaUsage.js b/client/src/components/User/DiskUsage/Quota/model/QuotaUsage.ts
similarity index 56%
rename from client/src/components/User/DiskUsage/Quota/model/QuotaUsage.js
rename to client/src/components/User/DiskUsage/Quota/model/QuotaUsage.ts
index f4bcc2a4d0e..b2480e52aa9 100644
--- a/client/src/components/User/DiskUsage/Quota/model/QuotaUsage.js
+++ b/client/src/components/User/DiskUsage/Quota/model/QuotaUsage.ts
@@ -1,71 +1,73 @@
-import { bytesToString } from "utils/utils";
+import { bytesToString } from "@/utils/utils";
 
 export const DEFAULT_QUOTA_SOURCE_LABEL = "Default";
 
+export interface QuotaUsageResponse {
+    quota_source_label?: string;
+    quota_bytes?: number;
+    total_disk_usage: number;
+    quota_percent?: number;
+}
+
 /**
  * Contains information about quota usage for a particular ObjectStore.
  */
 export class QuotaUsage {
-    constructor(data) {
+    private _data: QuotaUsageResponse;
+
+    constructor(data: QuotaUsageResponse) {
         this._data = data;
     }
 
     /**
      * The name of the ObjectStore associated with the quota.
-     * @returns {String}
      */
-    get sourceLabel() {
-        return this._data.quota_source_label || DEFAULT_QUOTA_SOURCE_LABEL;
+    get sourceLabel(): string {
+        return this._data.quota_source_label ?? DEFAULT_QUOTA_SOURCE_LABEL;
     }
 
     /**
      * The maximum allowed disk usage in bytes.
-     * @returns {Number}
      */
-    get quotaInBytes() {
+    get quotaInBytes(): number | undefined {
         return this._data.quota_bytes;
     }
 
     /**
      * The total amount of bytes used in this ObjectStore.
-     * @returns {Number}
      */
-    get totalDiskUsageInBytes() {
+    get totalDiskUsageInBytes(): number {
         return this._data.total_disk_usage;
     }
 
     /**
      * The percentage of used quota.
-     * @returns {Number}
      */
-    get quotaPercent() {
+    get quotaPercent(): number | undefined {
         return this._data.quota_percent;
     }
 
     /**
      * The maximum allowed disk usage as human readable size.
-     * @returns {String}
      */
-    get niceQuota() {
+    get niceQuota(): string {
         if (this.isUnlimited) {
             return "unlimited";
         }
-        return bytesToString(this.quotaInBytes, true);
+        return bytesToString(this.quotaInBytes, true, undefined);
     }
 
     /**
      * The total amount of disk used in this ObjectStore as human readable size.
-     * @returns {String}
      */
-    get niceTotalDiskUsage() {
-        return bytesToString(this.totalDiskUsageInBytes, true);
+    get niceTotalDiskUsage(): string {
+        return bytesToString(this.totalDiskUsageInBytes, true, undefined);
     }
 
     /**
      * Whether this ObjectStore has unlimited quota
-     * @returns {Boolean}
      */
-    get isUnlimited() {
+    get isUnlimited(): boolean {
         return !this.quotaInBytes;
     }
 }
diff --git a/client/src/components/User/DiskUsage/StorageDashboard.vue b/client/src/components/User/DiskUsage/StorageDashboard.vue
index 9b2b921a3ff..3acaed3cc21 100644
--- a/client/src/components/User/DiskUsage/StorageDashboard.vue
+++ b/client/src/components/User/DiskUsage/StorageDashboard.vue
@@ -1,52 +1,45 @@
+<script setup lang="ts">
+import localize from "@/utils/localization";
+import DiskUsageSummary from "./DiskUsageSummary.vue";
+import IconCard from "@/components/IconCard.vue";
+import { reactive } from "vue";
+import { useRouter } from "vue-router/composables";
+
+const router = useRouter();
+
+const texts = reactive({
+    title: localize("Storage Dashboard"),
+    subtitle: localize("Here you can see an overview of your disk usage status."),
+    freeSpace: {
+        title: localize("Is your usage more than expected?"),
+        description: localize(
+            "Find out what is eating up your space and learn how to easily and safely free up some of it."
+        ),
+        icon: "fas fa-broom fa-6x",
+        buttonText: localize("Free up disk usage"),
+    },
+});
+
+function goToStorageManager() {
+    router.push({ name: "StorageManager" });
+}
+</script>
+
 <template>
     <div>
         <header class="main-header">
             <h1 class="text-center my-3">
-                <b>{{ title }}</b>
+                <b>{{ texts.title }}</b>
             </h1>
-            <h2 class="text-center my-3 h-sm">{{ subtitle }}</h2>
+            <h2 class="text-center my-3 h-sm">{{ texts.subtitle }}</h2>
         </header>
-        <DiskUsageSummary class="m-3" />
-        <IconCard
+        <disk-usage-summary class="m-3" />
+        <icon-card
             class="mx-auto"
-            :title="freeSpaceData.title"
-            :description="freeSpaceData.description"
-            :icon="freeSpaceData.icon"
-            :button-text="freeSpaceData.buttonText"
+            :title="texts.freeSpace.title"
+            :description="texts.freeSpace.description"
+            :icon="texts.freeSpace.icon"
+            :button-text="texts.freeSpace.buttonText"
             @onButtonClick="goToStorageManager" />
     </div>
 </template>
-
-<script>
-import _l from "utils/localization";
-import DiskUsageSummary from "components/User/DiskUsage/DiskUsageSummary";
-import IconCard from "components/IconCard";
-
-export default {
-    components: {
-        DiskUsageSummary,
-        IconCard,
-    },
-    data() {
-        return {
-            title: _l("Storage Dashboard"),
-            subtitle: _l("Here you can see an overview of your disk usage status."),
-            freeSpaceData: {
-                title: _l("Is your usage more than expected?"),
-                description: _l(
-                    "Find out what is eating up your space and learn how to easily and safely free up some of it."
-                ),
-                icon: "fas fa-broom fa-6x",
-                buttonText: _l("Free up disk usage"),
-            },
-        };
-    },
-    methods: {
-        goToStorageManager() {
-            this.$router.push({
-                name: "StorageManager",
-            });
-        },
-    },
-};
-</script>
diff --git a/client/src/components/User/DiskUsage/StorageDashboardRouter.js b/client/src/components/User/DiskUsage/StorageDashboardRouter.js
deleted file mode 100644
index a53345cc389..00000000000
--- a/client/src/components/User/DiskUsage/StorageDashboardRouter.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { getAppRoot } from "onload/loadConfig";
-import Vue from "vue";
-import VueRouter from "vue-router";
-import StorageManager from "./Management/StorageManager";
-import StorageDashboard from "./StorageDashboard";
-
-Vue.use(VueRouter);
-
-export default new VueRouter({
-    mode: "history",
-    base: `${getAppRoot()}storage`,
-    routes: [
-        {
-            path: "/",
-            name: "StorageDashboard",
-            component: StorageDashboard,
-        },
-        {
-            path: "/management",
-            name: "StorageManager",
-            component: StorageManager,
-            props: true,
-        },
-        {
-            path: "*",
-            redirect: { name: "StorageDashboard" },
-        },
-    ],
-});
diff --git a/client/src/components/User/DiskUsage/index.js b/client/src/components/User/DiskUsage/index.js
deleted file mode 100644
index 2374b3b8c75..00000000000
--- a/client/src/components/User/DiskUsage/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import router from "./StorageDashboardRouter.js";
-
-export const StorageDashboardRouter = {
-    router,
-    render: (h) => h("router-view"),
-};
-
-export default StorageDashboardRouter;
diff --git a/client/src/components/User/ThemeSelector.vue b/client/src/components/User/ThemeSelector.vue
new file mode 100644
index 00000000000..caa7bf0c74f
--- /dev/null
+++ b/client/src/components/User/ThemeSelector.vue
@@ -0,0 +1,88 @@
+<script setup>
+import { useCurrentTheme } from "@/composables/user";
+import { useConfig } from "@/composables/config";
+import { computed, watch, ref } from "vue";
+import { withPrefix } from "@/utils/redirect";
+const { currentTheme, setCurrentTheme } = useCurrentTheme();
+const { config, isLoaded } = useConfig();
+
+const show = ref(false);
+const currentValue = computed({
+    get: () => {
+        return currentTheme;
+    },
+    set: (theme) => {
+        setCurrentTheme(theme);
+    },
+});
+
+function getLogo(themeDetails) {
+    return themeDetails["--masthead-logo-img"] ?? config.value.logo_src;
+}
+
+watch(
+    () => isLoaded.value,
+    () => {
+        const themes = Object.keys(config.value.themes);
+        show.value = themes?.length > 1 ?? false;
+        if (!themes.includes(currentTheme.value)) {
+            setCurrentTheme(themes[0]);
+        }
+    }
+);
+</script>
+
+<template>
+    <b-card :show="show" class="overflow-auto">
+        <b-form-radio-group v-model="currentValue">
+            <b-form-radio
+                v-for="(themeDetails, theme, index) in config.themes"
+                :key="theme"
+                :value="theme"
+                class="mb-2">
+                <span v-if="index === 0" class="font-weight-bold mb-1"> Default Theme ({{ theme }}). </span>
+                <span v-else class="font-weight-bold mb-1">Theme: {{ theme }}</span>
+                <div :style="themeDetails" class="theme-masthead">
+                    <img :src="withPrefix(getLogo(themeDetails))" alt="image" />
+                    <span v-localize class="theme-color">Text</span>
+                    <span v-localize class="theme-hover">Hover</span>
+                    <span v-localize class="theme-active">Active</span>
+                </div>
+            </b-form-radio>
+        </b-form-radio-group>
+    </b-card>
+</template>
+
+<style lang="scss" scoped>
+@import "~bootstrap/scss/bootstrap.scss";
+@import "custom_theme_variables.scss";
+.theme-element {
+    @extend .rounded;
+    @extend .p-1;
+}
+.theme-masthead {
+    @extend .theme-element;
+    background: var(--masthead-color);
+}
+.theme-color {
+    @extend .theme-element;
+    color: var(--masthead-text-color);
+    background: var(--masthead-link-color);
+}
+.theme-hover {
+    @extend .theme-element;
+    color: var(--masthead-text-hover);
+    background: var(--masthead-link-hover);
+}
+.theme-active {
+    @extend .theme-element;
+    color: var(--masthead-text-active);
+    background: var(--masthead-link-active);
+}
+img {
+    cursor: pointer;
+    display: inline;
+    border: none;
+    height: 2rem;
+}
+</style>
diff --git a/client/src/components/User/UserDeletion.test.js b/client/src/components/User/UserDeletion.test.js
index 909fa4de06f..86e54534be6 100644
--- a/client/src/components/User/UserDeletion.test.js
+++ b/client/src/components/User/UserDeletion.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import UserDeletion from "./UserDeletion";
 
 const localVue = getLocalVue(true);
diff --git a/client/src/components/User/UserDeletion.vue b/client/src/components/User/UserDeletion.vue
index de8776d338d..1aa65f5bfb2 100644
--- a/client/src/components/User/UserDeletion.vue
+++ b/client/src/components/User/UserDeletion.vue
@@ -41,15 +41,12 @@ import axios from "axios";
 import Vue from "vue";
 import BootstrapVue from "bootstrap-vue";
 import { userLogoutClient } from "utils/logout";
+import { withPrefix } from "utils/redirect";
 
 Vue.use(BootstrapVue);
 
 export default {
     props: {
-        root: {
-            type: String,
-            required: true,
-        },
         userId: {
             type: String,
             required: true,
@@ -94,7 +91,7 @@ export default {
             if (this.email === this.name) {
                 this.nameState = true;
                 try {
-                    await axios.delete(`${this.root}api/users/${this.userId}`);
+                    await axios.delete(withPrefix(`/api/users/${this.userId}`));
                 } catch (e) {
                     if (e.response.status === 403) {
                         this.deleteError =
diff --git a/client/src/components/User/UserPreferences.vue b/client/src/components/User/UserPreferences.vue
index 58a43dbcda0..fd88bb519e1 100644
--- a/client/src/components/User/UserPreferences.vue
+++ b/client/src/components/User/UserPreferences.vue
@@ -5,68 +5,113 @@
             {{ message }}
         </b-alert>
         <p>
-            {{ titleLoggedInAs }} <strong id="user-preferences-current-email">{{ email }}</strong
-            >.
+            <span v-localize>You are logged in as</span>
+            <strong id="user-preferences-current-email">{{ email }}</strong>
+            <span v-localize>and you are using</span>
+            <strong>{{ diskUsage }}</strong>
+            <span v-localize>of disk space.</span>
+            <span v-localize>If this is more than expected, please visit the</span>
+            <router-link id="edit-preferences-cloud-auth" to="/storage">
+                <b v-localize>Storage Dashboard</b>
+            </router-link>
+            <span v-localize>to free up disk space.</span>
+            <span v-if="enableQuotas">
+                <span v-localize>Your disk quota is:</span>
+                <strong>{{ diskQuota }}</strong
+                >.
+            </span>
         </p>
-        <b-row v-for="(link, index) in activeLinks" :key="index" class="ml-3 mb-1">
-            <i :class="['pref-icon pt-1 fa fa-lg', link.icon]" />
-            <div class="pref-content pr-1">
-                <a v-if="link.onclick" :id="link.id" href="javascript:void(0)" @click="link.onclick"
-                    ><b>{{ link.title }}</b></a
-                >
-                <a v-else :id="link.id" :href="`${baseUrl}/${link.action}`"
-                    ><b>{{ link.title }}</b></a
-                >
-                <div class="form-text text-muted">
-                    {{ link.description }}
-                </div>
-            </div>
-        </b-row>
-
-      <ConfigProvider v-slot="{ config }">
+        <user-preferences-element
+            v-for="(link, index) in activePreferences"
+            :id="link.id"
+            :key="index"
+            :icon="link.icon"
+            :title="link.title"
+            :description="link.description"
+            :to="`/user/${index}`" />
+        <user-preferences-element
+            id="edit-preferences-api-key"
+            icon="fa-key"
+            title="Manage API Key"
+            description="Access your current API key or create a new one."
+            to="/user/api_key" />
+        <user-preferences-element
+            id="edit-preferences-cloud-auth"
+            icon="fa-cloud"
+            title="Manage Cloud Authorization"
+            description="Add or modify the configuration that grants Galaxy to access your cloud-based resources."
+            to="/user/cloud_auth" />
+        <ConfigProvider v-slot="{ config }">
+            <user-preferences-element
+                v-if="!config.enable_oidc"
+                id="manage-third-party-identities"
+                icon="fa-id-card-o"
+                title="Manage Third-Party Identities"
+                description="Connect or disconnect access to your third-party identities."
+                to="/user/external_ids" />
+        </ConfigProvider>
+        <user-preferences-element
+            id="edit-preferences-custom-builds"
+            icon="fa-cubes"
+            title="Manage Custom Builds"
+            description="Add or remove custom builds using history datasets."
+            to="/custom_builds" />
+        <user-preferences-element
+            v-if="hasThemes"
+            icon="fa-palette"
+            title="Pick a Color Theme"
+            description="Click here to change the user interface color theme."
+            badge="New!"
+            @click="toggleTheme = !toggleTheme">
+            <b-collapse v-model="toggleTheme">
+                <ThemeSelector />
+            </b-collapse>
+        </user-preferences-element>
+        <user-preferences-element
+            id="edit-preferences-notifications"
+            icon="fa-plus-square-o"
+            title="Enable notifications"
+            description="Allow push and tab notifcations on job completion. To disable, revoke the site notification privilege in your browser."
+            @click="toggleNotifications" />
+        <ConfigProvider v-slot="{ config }">
+            <user-preferences-element
+                v-if="!config.single_user"
+                id="edit-preferences-make-data-private"
+                icon="fa-lock"
+                title="Make All Data Private"
+                description="Click here to make all data private."
+                @click="makeDataPrivate" />
+        </ConfigProvider>
+        <ConfigProvider v-slot="{ config }">
         <UserBeaconSettings
             v-if="config && config.enable_beacon_integration"
             :root="root"
             :user-id="userId">>
         </UserBeaconSettings>
       </ConfigProvider>
-
-        <b-row class="ml-3 mb-1">
-            <i class="pref-icon pt-1 fa fa-lg fa-plus-square-o" />
-            <div class="pref-content pr-1">
-                <a href="javascript:void(0)" @click="toggleNotifications"><b v-localize>Enable notifications</b></a>
-                <div v-localize class="form-text text-muted">
-                    Allow push and tab notifcations on job completion. To disable, revoke the site notification
-                    privilege in your browser.
-                </div>
-            </div>
-        </b-row>
         <ConfigProvider v-slot="{ config }">
             <UserDeletion
                 v-if="config && !config.single_user && config.enable_account_interface"
                 :email="email"
-                :root="root"
                 :user-id="userId">
             </UserDeletion>
         </ConfigProvider>
-        <p class="mt-2">
-            You are using <strong>{{ diskUsage }}</strong> of disk space in this Galaxy instance.
-            <span v-if="enableQuotas">
-                Your disk quota is: <strong>{{ diskQuota }}</strong
-                >.
-            </span>
-            Is your usage more than expected? Review your
-            <b-link :href="storageDashboardUrl"><b>Storage Dashboard</b></b-link
-            >.
-        </p>
+        <user-preferences-element
+            v-if="hasLogout"
+            id="edit-preferences-sign-out"
+            icon="fa-sign-out"
+            title="Sign Out"
+            description="Click here to sign out of all sessions."
+            @click="signOut" />
     </b-container>
 </template>
 
 <script>
 import Vue from "vue";
 import BootstrapVue from "bootstrap-vue";
+import ThemeSelector from "./ThemeSelector.vue";
 import { getGalaxyInstance } from "app";
-import { getAppRoot } from "onload/loadConfig";
+import { withPrefix } from "utils/redirect";
 import _l from "utils/localization";
 import axios from "axios";
 import QueryStringParsing from "utils/query-string-parsing";
@@ -74,6 +119,8 @@ import { getUserPreferencesModel } from "components/User/UserPreferencesModel";
 import ConfigProvider from "components/providers/ConfigProvider";
 import { userLogoutAll } from "utils/logout";
 import UserDeletion from "./UserDeletion";
+import UserPreferencesElement from "./UserPreferencesElement";
+
 import "@fortawesome/fontawesome-svg-core";
 import UserBeaconSettings from "./UserBeaconSettings";
 
@@ -83,6 +130,8 @@ export default {
     components: {
         ConfigProvider,
         UserDeletion,
+        UserPreferencesElement,
+        ThemeSelector,
         UserBeaconSettings
     },
     props: {
@@ -100,43 +149,24 @@ export default {
             email: "",
             diskUsage: "",
             diskQuota: "",
-            storageDashboardUrl: `${getAppRoot()}storage`,
-            root: getAppRoot(),
             messageVariant: null,
             message: null,
-            submittedNames: [],
-            titleLoggedInAs: _l("You are logged in as"),
+            toggleTheme: false,
         };
     },
     computed: {
-        baseUrl() {
-            return `${this.root}user`;
+        activePreferences() {
+            const enabledPreferences = Object.entries(getUserPreferencesModel()).filter((f) => !f.disabled);
+            return Object.fromEntries(enabledPreferences);
         },
-        activeLinks() {
-            const activeLinks = {};
-            const UserPreferencesModel = getUserPreferencesModel();
-            for (const key in UserPreferencesModel) {
-                if (UserPreferencesModel[key].shouldRender !== false) {
-                    activeLinks[key] = UserPreferencesModel[key];
-                    switch (key) {
-                        case "make_data_private":
-                            activeLinks[key].onclick = this.makeDataPrivate;
-                            break;
-                        case "custom_builds":
-                            activeLinks[key].onclick = this.openManageCustomBuilds;
-                            break;
-                        case "logout":
-                            activeLinks[key].onclick = this.signOut;
-                            break;
-                        // case "delete_user":
-                        //     activeLinks[key].onclick = this.deleteUser;
-                        default:
-                            activeLinks[key].action = key;
-                    }
-                }
-            }
-
-            return activeLinks;
+        hasLogout() {
+            const Galaxy = getGalaxyInstance();
+            return !!Galaxy.session_csrf_token && !Galaxy.config.single_user;
+        },
+        hasThemes() {
+            const Galaxy = getGalaxyInstance();
+            const themes = Object.keys(Galaxy.config.themes);
+            return themes?.length > 1 ?? false;
         },
     },
     created() {
@@ -146,7 +176,7 @@ export default {
             this.message = message;
             this.messageVariant = status;
         }
-        axios.get(`${getAppRoot()}api/users/${this.userId}`).then((response) => {
+        axios.get(withPrefix(`/api/users/${this.userId}`)).then((response) => {
             this.email = response.data.email;
             this.diskUsage = response.data.nice_total_disk_usage;
             this.diskQuota = response.data.quota;
@@ -169,9 +199,6 @@ export default {
                 alert("Notifications are not supported by this browser.");
             }
         },
-        openManageCustomBuilds() {
-            this.$router.push(`/custom_builds`);
-        },
         makeDataPrivate() {
             const Galaxy = getGalaxyInstance();
             if (
@@ -187,10 +214,12 @@ export default {
                     )
                 )
             ) {
-                axios.post(`${getAppRoot()}history/make_private?all_histories=true`).then((response) => {
+                axios.post(withPrefix(`/history/make_private?all_histories=true`)).then((response) => {
                     Galaxy.modal.show({
                         title: _l("Datasets are now private"),
-                        body: `All of your histories and datsets have been made private.  If you'd like to make all *future* histories private please use the <a href="${Galaxy.root}user/permissions">User Permissions</a> interface.`,
+                        body: `All of your histories and datsets have been made private.  If you'd like to make all *future* histories private please use the <a href="${withPrefix(
+                            "/user/permissions"
+                        )}">User Permissions</a> interface.`,
                         buttons: {
                             Close: () => {
                                 Galaxy.modal.hide();
@@ -216,6 +245,3 @@ export default {
     },
 };
 </script>
-<style scoped>
-@import "user-styles.scss";
-</style>
diff --git a/client/src/components/User/UserPreferencesElement.vue b/client/src/components/User/UserPreferencesElement.vue
new file mode 100644
index 00000000000..bdd6941448c
--- /dev/null
+++ b/client/src/components/User/UserPreferencesElement.vue
@@ -0,0 +1,57 @@
+<script setup>
+import { BRow } from "bootstrap-vue";
+defineProps({
+    id: {
+        type: String,
+        default: null,
+    },
+    icon: {
+        type: String,
+        default: "fa-gear",
+    },
+    title: {
+        type: String,
+        default: "Title not available.",
+    },
+    description: {
+        type: String,
+        default: "Description not available.",
+    },
+    to: {
+        type: String,
+        default: null,
+    },
+    badge: {
+        type: String,
+        default: null,
+    },
+});
+</script>
+<template>
+    <b-row class="ml-3 mb-1">
+        <i :class="['pref-icon pt-1 fa fa-lg', icon]" />
+        <div class="pref-content pr-1">
+            <b-badge v-if="!!badge" variant="danger">
+                {{ badge }}
+            </b-badge>
+            <router-link v-if="to" :id="id" :to="to">
+                <b v-localize>{{ title }}</b>
+            </router-link>
+            <a v-else :id="id" href="#" @click="$emit('click')">
+                <b v-localize>{{ title }}</b>
+            </a>
+            <div class="form-text text-muted">
+                {{ description }}
+            </div>
+            <slot />
+        </div>
+    </b-row>
+</template>
+<style scoped>
+.pref-content {
+    width: calc(100% - 3rem);
+}
+.pref-icon {
+    width: 3rem;
+}
+</style>
diff --git a/client/src/components/User/UserPreferencesModel.js b/client/src/components/User/UserPreferencesModel.js
index bf96454d856..c4ece7087cd 100644
--- a/client/src/components/User/UserPreferencesModel.js
+++ b/client/src/components/User/UserPreferencesModel.js
@@ -15,7 +15,7 @@ export const getUserPreferencesModel = (user_id) => {
             url: `/api/users/${user_id}/information/inputs`,
             icon: "fa-user",
             redirect: "/user",
-            shouldRender: !config.use_remote_user,
+            disabled: config.use_remote_user,
         },
         password: {
             title: _l("Change Password"),
@@ -25,16 +25,7 @@ export const getUserPreferencesModel = (user_id) => {
             url: `/api/users/${user_id}/password/inputs`,
             submit_title: "Save Password",
             redirect: "/user",
-            shouldRender: !config.use_remote_user && config.enable_account_interface,
-        },
-        external_ids: {
-            title: _l("Manage Third-Party Identities"),
-            id: "manage-third-party-identities",
-            description: _l("Connect or disconnect access to your third-party identities."),
-            icon: "fa-id-card-o",
-            submitTitle: "Disconnect identity",
-            submitIcon: "fa-trash",
-            shouldRender: config.enable_oidc,
+            disabled: config.use_remote_user || !config.enable_account_interface,
         },
         permissions: {
             title: _l("Set Dataset Permissions for New Histories"),
@@ -46,29 +37,7 @@ export const getUserPreferencesModel = (user_id) => {
             icon: "fa-users",
             submitTitle: "Save Permissions",
             redirect: "/user",
-            shouldRender: !config.single_user,
-        },
-        make_data_private: {
-            title: _l("Make All Data Private"),
-            id: "edit-preferences-make-data-private",
-            description: _l("Click here to make all data private."),
-            icon: "fa-lock",
-            shouldRender: !config.single_user,
-        },
-        api_key: {
-            id: "edit-preferences-api-key",
-            title: _l("Manage API Key"),
-            description: _l("Access your current API key or create a new one."),
-            icon: "fa-key",
-        },
-        cloud_auth: {
-            id: "edit-preferences-cloud-auth",
-            title: _l("Manage Cloud Authorization"),
-            description: _l("Add or modify the configuration that grants Galaxy to access your cloud-based resources."),
-            icon: "fa-cloud",
-            submitTitle: "Create a new Key",
-            submitIcon: "fa-check",
-            shouldRender: true,
+            disabled: config.single_user,
         },
         toolbox_filters: {
             title: _l("Manage Toolbox Filters"),
@@ -78,19 +47,7 @@ export const getUserPreferencesModel = (user_id) => {
             icon: "fa-filter",
             submitTitle: "Save Filters",
             redirect: "/user",
-            shouldRender: !!config.has_user_tool_filters,
-        },
-        custom_builds: {
-            title: _l("Manage Custom Builds"),
-            description: _l("Add or remove custom builds using history datasets."),
-            icon: "fa-cubes",
-        },
-        logout: {
-            title: _l("Sign out"),
-            id: "edit-preferences-sign-out",
-            description: _l("Click here to sign out of all sessions."),
-            icon: "fa-sign-out",
-            shouldRender: !!Galaxy.session_csrf_token && !config.single_user,
+            disabled: !config.has_user_tool_filters,
         },
     };
 };
diff --git a/client/src/components/UtcDate.test.js b/client/src/components/UtcDate.test.js
index e4dfc151fd1..c59d9c8ff31 100644
--- a/client/src/components/UtcDate.test.js
+++ b/client/src/components/UtcDate.test.js
@@ -1,5 +1,5 @@
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import UtcDate from "./UtcDate.vue";
 
 describe("UTCDate component", () => {
diff --git a/client/src/components/Visualizations/DisplayApplications.test.js b/client/src/components/Visualizations/DisplayApplications.test.js
index b2899806ab2..a1c539ed09a 100644
--- a/client/src/components/Visualizations/DisplayApplications.test.js
+++ b/client/src/components/Visualizations/DisplayApplications.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import DisplayApplications from "./DisplayApplications";
 import MockProvider from "components/providers/MockProvider";
 
diff --git a/client/src/components/Visualizations/Tabular/TabularChunkedView.vue b/client/src/components/Visualizations/Tabular/TabularChunkedView.vue
new file mode 100644
index 00000000000..c5c1cfddcdb
--- /dev/null
+++ b/client/src/components/Visualizations/Tabular/TabularChunkedView.vue
@@ -0,0 +1,199 @@
+<script setup lang="ts">
+import axios from "axios";
+import { computed, onMounted, reactive, ref, watch } from "vue";
+import { parse } from "csv-parse/sync";
+import { getAppRoot } from "@/onload/loadConfig";
+import { useWindowScroll } from "@vueuse/core";
+
+interface TabularChunk {
+    ck_data: string;
+    offset: number;
+    data_line_offset: number;
+}
+
+interface TabularChunkedViewProps {
+    options: {
+        dataset_config: {
+            id: string;
+            file_ext: string;
+            first_data_chunk: TabularChunk;
+            metadata_columns: number;
+            metadata_column_types: string[];
+            metadata_column_names: string[];
+        };
+    };
+}
+
+const props = defineProps<TabularChunkedViewProps>();
+
+const offset = ref(0);
+const loading = ref(true);
+// TODO: add visual loading indicator
+const atEOF = ref(false);
+
+const tabularData = reactive<{ rows: string[][] }>({
+    rows: [],
+});
+
+const columns = computed(() => {
+    const columns = Array(props.options.dataset_config.metadata_columns);
+    // for each column_name, inject header
+    if (props.options.dataset_config.metadata_column_names?.length > 0) {
+        props.options.dataset_config.metadata_column_names.forEach((column_name, index) => {
+            columns[index] = column_name;
+        });
+    }
+    return columns;
+});
+
+const columnStyle = computed(() => {
+    const columnStyle = Array(props.options.dataset_config.metadata_columns);
+    if (props.options.dataset_config.metadata_column_types?.length > 0) {
+        props.options.dataset_config.metadata_column_types.forEach((column_type, index) => {
+            columnStyle[index] = column_type === "str" || column_type === "list" ? "stringalign" : "numberalign";
+        });
+    }
+    return columnStyle;
+});
+
+const delimiter = computed(() => {
+    return props.options.dataset_config.file_ext === "csv" ? "," : "\t";
+});
+
+const chunkUrl = computed(() => {
+    return `${getAppRoot()}dataset/display?dataset_id=${props.options.dataset_config.id}`;
+});
+
+// Loading more data on user scroll to (near) bottom.
+const { y } = useWindowScroll();
+watch(y, (newY) => {
+    if (
+        atEOF.value !== true &&
+        loading.value === false &&
+        newY > document.body.scrollHeight - window.innerHeight - 100
+    ) {
+        nextChunk();
+    }
+});
+
+function processChunk(chunk: TabularChunk) {
+    // parsedChunk is a 2d array of strings
+    let parsedChunk = [];
+    try {
+        parsedChunk = parse(chunk.ck_data, { delimiter: delimiter.value, relax_quotes: true });
+    } catch (error) {
+        // If this blows up it's likely data in a comment or header line
+        // (e.g. VCF files) so just split it by newline first then parse
+        // each line individually.
+        parsedChunk = chunk.ck_data.trim().split("\n");
+        parsedChunk = parsedChunk.map((line) => {
+            try {
+                return parse(line, { delimiter: delimiter.value })[0];
+            } catch (error) {
+                // Failing lines get passed through intact for row-level
+                // rendering/parsing.
+                return [line];
+            }
+        });
+    }
+    parsedChunk.forEach((row: string[], index: number) => {
+        if (index >= (chunk.data_line_offset || 0)) {
+            // TODO test perf of a batch update instead of individual row pushes?
+            tabularData.rows.push(processRow(row));
+        }
+    });
+    // update new offset
+    offset.value = chunk.offset;
+}
+
+function processRow(row: string[]) {
+    const num_columns = columns.value.length;
+    if (row.length === num_columns) {
+        // pass through
+        return row;
+    } else if (row.length > num_columns) {
+        // SAM file or like format with optional metadata included.
+        return row.slice(0, num_columns - 1).concat([row.slice(num_columns - 1).join("\t")]);
+    } else if (row.length === 1) {
+        // Try to split by comma first
+        let rowDataSplit = row[0].split(",");
+        if (rowDataSplit.length === num_columns) {
+            return rowDataSplit;
+        }
+        // Try to split by tab
+        rowDataSplit = row[0].split("\t");
+        if (rowDataSplit.length === num_columns) {
+            return rowDataSplit;
+        }
+        // Try to split by space
+        rowDataSplit = row[0].split(" ");
+        if (rowDataSplit.length === num_columns) {
+            return rowDataSplit;
+        }
+        return row;
+    } else {
+        // rowData.length is greater than one, but less than num_columns.  Render cells and pad tds.
+        // Possibly a SAM file or like format with optional metadata missing.
+        // Could also be a tabular file with a line with missing columns.
+        return row.concat(Array(num_columns - row.length).fill(""));
+    }
+}
+
+function nextChunk() {
+    // Attempt to fetch next chunk, given the current offset.
+    loading.value = true;
+    axios
+        .get(chunkUrl.value, {
+            params: {
+                offset: offset.value,
+            },
+        })
+        .then((response) => {
+            if (response.data.ck_data === "") {
+                // Galaxy returns an empty chunk if there's no more.
+                atEOF.value = true;
+            } else {
+                // Otherwise process the chunk.
+                processChunk(response.data);
+            }
+            loading.value = false;
+        });
+}
+
+onMounted(() => {
+    // Render first chunk if available.
+    if (props.options.dataset_config.first_data_chunk) {
+        processChunk(props.options.dataset_config.first_data_chunk);
+        loading.value = false;
+    }
+});
+</script>
+
+<template>
+    <div>
+        <!-- TODO loading spinner locked to top right -->
+        <b-table-simple hover small striped>
+            <b-thead head-variant="dark">
+                <b-tr>
+                    <b-th v-for="(column, index) in columns" :key="column">{{ column || `Column ${index + 1}` }}</b-th>
+                </b-tr>
+            </b-thead>
+            <b-tbody>
+                <b-tr v-for="(row, index) in tabularData.rows" :key="index">
+                    <b-td v-for="(element, elementIndex) in row" :key="elementIndex" :class="columnStyle[elementIndex]">
+                        {{ element }}
+                    </b-td>
+                </b-tr>
+            </b-tbody>
+        </b-table-simple>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+.stringalign {
+    text-align: left;
+}
+.numberalign {
+    text-align: right;
+}
+</style>
diff --git a/client/src/components/Workflow/Editor/Attributes.vue b/client/src/components/Workflow/Editor/Attributes.vue
index b094bd4c794..c825f32e2e4 100644
--- a/client/src/components/Workflow/Editor/Attributes.vue
+++ b/client/src/components/Workflow/Editor/Attributes.vue
@@ -85,12 +85,14 @@ export default {
         },
         annotation: {
             type: String,
+            default: null,
         },
         license: {
             type: String,
             default: "",
         },
         creator: {
+            type: Object,
             default: null,
         },
         version: {
diff --git a/client/src/components/Workflow/Editor/ConnectionMenu.vue b/client/src/components/Workflow/Editor/ConnectionMenu.vue
new file mode 100644
index 00000000000..ec214414ab9
--- /dev/null
+++ b/client/src/components/Workflow/Editor/ConnectionMenu.vue
@@ -0,0 +1,123 @@
+<template>
+    <b-list-group id="input-choices-menu" ref="menu" role="menu" @keyup.down="increment" @keyup.up="decrement">
+        <template v-if="allElements.length === 0">
+            <b-list-group-item ref="menuItem" tabindex="0" role="menuitem">
+                No compatible input found in workflow
+            </b-list-group-item>
+        </template>
+        <template v-else>
+            <b-list-group-item
+                v-for="(input, index) in allElements"
+                :key="input.inputLabel + input.stepId"
+                ref="menuItem"
+                role="menuitem"
+                tabindex="0"
+                :active="activeElement === index"
+                @click="toggleConnection(input)"
+                @keyup.enter="toggleConnection(input)"
+                @focus="activeElement = index">
+                {{ input.connected ? "Disconnect from" : "Connect to" }} {{ input.inputLabel }}
+            </b-list-group-item>
+        </template>
+    </b-list-group>
+</template>
+<script lang="ts" setup>
+import { useWorkflowStepStore } from "@/stores/workflowStepStore";
+import { computed, onMounted, ref, watch, type ComputedRef } from "vue";
+import { type OutputTerminals, type InputTerminals, terminalFactory } from "./modules/terminals";
+import { useFocusWithin } from "@/composables/useActiveElement";
+
+const props = defineProps<{
+    terminal: OutputTerminals;
+}>();
+
+const menu = ref();
+const { focused } = useFocusWithin(menu);
+
+const activeElement = ref(0);
+const menuItem = ref<HTMLLIElement[] | HTMLLIElement>();
+const emit = defineEmits<{ (e: "closeMenu", value: boolean): void }>();
+
+onMounted(() => {
+    if (menuItem.value) {
+        if ("length" in menuItem.value) {
+            menuItem.value[0].focus();
+        } else {
+            menuItem.value.focus();
+        }
+    }
+});
+
+watch(focused, (focused) => {
+    if (!focused) {
+        emit("closeMenu", true);
+    }
+});
+
+const stepStore = useWorkflowStepStore();
+
+interface InputObject {
+    stepId: number;
+    inputName: string;
+    inputLabel: string;
+    connected: boolean;
+}
+
+function increment() {
+    if (menuItem.value && "length" in menuItem.value) {
+        activeElement.value += 1;
+        activeElement.value = Math.min(activeElement.value, menuItem.value!.length - 1);
+        menuItem.value![activeElement.value].focus();
+    }
+}
+
+function decrement() {
+    if (menuItem.value && "length" in menuItem.value) {
+        activeElement.value = Math.max(activeElement.value - 1, 0);
+        menuItem.value![activeElement.value].focus();
+    }
+}
+
+function terminalToInputObject(terminal: InputTerminals, connected: boolean): InputObject {
+    const step = stepStore.getStep(terminal.stepId);
+    const inputLabel = `${terminal.name} in step ${step.id + 1}: ${step.label}`;
+    return { stepId: step.id, inputName: terminal.name, inputLabel, connected };
+}
+
+function inputObjectToTerminal(inputObject: InputObject): InputTerminals {
+    const inputSource = stepStore
+        .getStep(inputObject.stepId)
+        .inputs.find((input) => input.name == inputObject.inputName)!;
+    return terminalFactory(inputObject.stepId, inputSource, props.terminal.datatypesMapper);
+}
+
+const validInputs: ComputedRef<InputObject[]> = computed(() => {
+    const inputTerminals = props.terminal.validInputTerminals();
+    return inputTerminals.map((inputTerminal) => terminalToInputObject(inputTerminal, false));
+});
+
+const connectedInputs: ComputedRef<InputObject[]> = computed(() => {
+    const inputTerminals = props.terminal.getConnectedTerminals();
+    return inputTerminals.map((inputTerminal) => terminalToInputObject(inputTerminal, true));
+});
+
+const allElements = computed(() => {
+    const allElements = [...connectedInputs.value, ...validInputs.value];
+    allElements.sort((elementA, elementB) => {
+        const stepIdSort = elementA.stepId - elementB.stepId;
+        if (stepIdSort === 0) {
+            return (elementA.inputLabel || elementA.inputName) < (elementB.inputLabel || elementB.inputName) ? -1 : 1;
+        }
+        return stepIdSort;
+    });
+    return allElements;
+});
+
+function toggleConnection(inputObject: InputObject) {
+    if (inputObject.connected) {
+        inputObjectToTerminal(inputObject).disconnect(props.terminal);
+    } else {
+        inputObjectToTerminal(inputObject).connect(props.terminal);
+    }
+}
+</script>
diff --git a/client/src/components/Workflow/Editor/Connector.vue b/client/src/components/Workflow/Editor/Connector.vue
new file mode 100644
index 00000000000..e78e13a3028
--- /dev/null
+++ b/client/src/components/Workflow/Editor/Connector.vue
@@ -0,0 +1,73 @@
+<template>
+    <g :id="id" class="ribbon">
+        <g v-for="svgLine in paths" :key="svgLine">
+            <path class="ribbon-outer" :d="svgLine" :stroke-width="stroke.outerStroke" fill="none"></path>
+            <path class="ribbon-inner" :d="svgLine" :stroke-width="stroke.innerStroke" fill="none"></path>
+        </g>
+    </g>
+</template>
+<script lang="ts" setup>
+import { line, curveBasis } from "d3";
+import { computed } from "vue";
+import type { TerminalPosition } from "@/stores/workflowEditorStateStore";
+
+const props = withDefaults(
+    defineProps<{
+        id?: string;
+        position: TerminalPosition;
+        inputIsMappedOver: boolean;
+        outputIsMappedOver: boolean;
+    }>(),
+    {
+        id: undefined,
+        inputIsMappedOver: false,
+        outputIsMappedOver: false,
+    }
+);
+
+const path = line().curve(curveBasis);
+
+const ribbonMargin = 4;
+const lineShift = 30;
+
+const stroke = computed(() => {
+    let innerStroke = 4;
+    let outerStroke = 6;
+    if (props.outputIsMappedOver || props.inputIsMappedOver) {
+        innerStroke = 1;
+        outerStroke = 3;
+    }
+    return { innerStroke, outerStroke };
+});
+
+const offsets = computed(() => {
+    const _offsets = [-2 * ribbonMargin, -ribbonMargin, 0, ribbonMargin, 2 * ribbonMargin];
+    let startOffsets = [0];
+    let endOffsets = [0];
+    let numOffsets = 1;
+
+    if (props.outputIsMappedOver) {
+        startOffsets = _offsets;
+        numOffsets = _offsets.length;
+    }
+    if (props.inputIsMappedOver) {
+        endOffsets = _offsets;
+        numOffsets = _offsets.length;
+    }
+    return { numOffsets, startOffsets, endOffsets };
+});
+
+const paths = computed(() => {
+    const lines = [...Array(offsets.value.numOffsets).keys()].map((offsetIndex) => {
+        const startOffset = offsets.value.startOffsets[offsetIndex] || 0;
+        const endOffset = offsets.value.endOffsets[offsetIndex] || 0;
+        return [
+            [props.position.startX, props.position.startY + startOffset],
+            [props.position.startX + lineShift, props.position.startY + startOffset],
+            [props.position.endX - lineShift, props.position.endY + endOffset],
+            [props.position.endX, props.position.endY + endOffset],
+        ] as [number, number][];
+    });
+    return lines.map((line) => path(line)!);
+});
+</script>
diff --git a/client/src/components/Workflow/Editor/Draggable.vue b/client/src/components/Workflow/Editor/Draggable.vue
new file mode 100644
index 00000000000..58bed655d35
--- /dev/null
+++ b/client/src/components/Workflow/Editor/Draggable.vue
@@ -0,0 +1,78 @@
+<script lang="ts" setup>
+import { ref, inject, reactive } from "vue";
+import type { Ref } from "vue";
+import { useElementSize } from "@vueuse/core";
+import { useDraggable } from "./composables/useDraggable.js";
+import type { ZoomTransform } from "d3-zoom";
+
+const props = defineProps({
+    rootOffset: {
+        type: Object,
+        required: true,
+    },
+    preventDefault: {
+        type: Boolean,
+        default: true,
+    },
+    stopPropagation: {
+        type: Boolean,
+        default: true,
+    },
+    dragData: {
+        type: Object,
+        required: false,
+        default: null,
+    },
+});
+
+const emit = defineEmits(["mousedown", "mouseup", "move", "dragstart", "start", "stop"]);
+
+const draggable = ref();
+const size = reactive(useElementSize(draggable));
+const transform: Ref<ZoomTransform> | undefined = inject("transform");
+
+const onStart = (position: any, event: DragEvent) => {
+    emit("start");
+    emit("mousedown", event);
+    if (event.type == "dragstart") {
+        // I guess better than copy ?
+        event.dataTransfer!.effectAllowed = "link";
+        if (props.dragData) {
+            event.dataTransfer!.setData("text/plain", JSON.stringify(props.dragData));
+        }
+        emit("dragstart", event);
+    }
+};
+
+const onMove = (position: any, event: DragEvent) => {
+    if (event.type == "drag" && event.x == 0 && event.y == 0) {
+        // the last drag event has no coordinate ... this is obviously a hack!
+        return;
+    }
+    const newPosition = {
+        unscaled: { ...position, ...size },
+        x: (position.x - props.rootOffset.x - transform!.value.x) / transform!.value.k,
+        y: (position.y - props.rootOffset.y - transform!.value.y) / transform!.value.k,
+    };
+    emit("move", newPosition, event);
+};
+
+const onEnd = (position: any, event: DragEvent) => {
+    emit("stop");
+    emit("mouseup");
+};
+
+useDraggable(draggable, {
+    preventDefault: props.preventDefault,
+    stopPropagation: props.stopPropagation,
+    useCapture: false,
+    onStart: onStart,
+    onMove: onMove,
+    onEnd: onEnd,
+});
+</script>
+<template>
+    <div ref="draggable">
+        <slot></slot>
+    </div>
+</template>
diff --git a/client/src/components/Workflow/Editor/DraggablePan.vue b/client/src/components/Workflow/Editor/DraggablePan.vue
new file mode 100644
index 00000000000..7f13013526f
--- /dev/null
+++ b/client/src/components/Workflow/Editor/DraggablePan.vue
@@ -0,0 +1,105 @@
+<template>
+    <Draggable
+        :root-offset="rootOffset"
+        :prevent-default="preventDefault"
+        :stop-propagation="stopPropagation"
+        :drag-data="dragData"
+        @move="onMove"
+        @mouseup="onMouseUp"
+        v-on="$listeners">
+        <slot></slot>
+    </Draggable>
+</template>
+
+<script>
+import Draggable from "./Draggable.vue";
+
+export default {
+    components: {
+        Draggable,
+    },
+    props: {
+        rootOffset: {
+            type: Object,
+            required: true,
+        },
+        scale: {
+            type: Number,
+            required: false,
+            default: 1,
+        },
+        preventDefault: {
+            type: Boolean,
+            default: true,
+        },
+        stopPropagation: {
+            type: Boolean,
+            default: true,
+        },
+        dragData: {
+            type: Object,
+            required: false,
+            default: null,
+        },
+    },
+    data() {
+        return {
+            isPanning: false,
+            // distance to move per pan
+            deltaPerPan: 8,
+            // 60hz seems pretty common, should result in smooth panning
+            refreshRate: 1000 / 60,
+            panBy: {},
+            timeout: null,
+        };
+    },
+    beforeDestroy() {
+        clearTimeout(this.timeout);
+    },
+    methods: {
+        emitPan(position) {
+            if (this.isPanning) {
+                this.$emit("pan-by", this.panBy);
+                // we need to move in the opposite direction of the pan
+                position.x -= this.panBy.x;
+                position.y -= this.panBy.y;
+                this.$emit("move", position);
+            }
+            this.timeout = setTimeout(() => {
+                this.emitPan(position);
+            }, this.refreshRate);
+        },
+        onMove(position, event) {
+            clearTimeout(this.timeout);
+            // Check if we're out of bounds
+            let doPan = false;
+            const panBy = { x: 0, y: 0 };
+            const delta = this.deltaPerPan / this.scale;
+            if (position.unscaled.x - this.rootOffset.left < 0) {
+                panBy["x"] = delta;
+                doPan = true;
+            }
+            if (position.unscaled.y - this.rootOffset.top < 0) {
+                panBy["y"] = delta;
+                doPan = true;
+            }
+            if (this.rootOffset.right - position.unscaled.x - position.unscaled.width * this.scale < 0) {
+                panBy["x"] = -delta;
+                doPan = true;
+            }
+            if (this.rootOffset.bottom - position.unscaled.y - position.unscaled.height * this.scale < 0) {
+                panBy["y"] = -delta;
+                doPan = true;
+            }
+            this.$emit("move", position, event);
+            this.panBy = panBy;
+            this.isPanning = doPan;
+            this.emitPan(position);
+        },
+        onMouseUp(e) {
+            this.isPanning = false;
+            this.$emit("mouseup", e);
+        },
+    },
+};
+</script>
diff --git a/client/src/components/Workflow/Editor/Forms/FormDefault.test.js b/client/src/components/Workflow/Editor/Forms/FormDefault.test.js
index 12b0a9bb637..7ab61f364dd 100644
--- a/client/src/components/Workflow/Editor/Forms/FormDefault.test.js
+++ b/client/src/components/Workflow/Editor/Forms/FormDefault.test.js
@@ -1,46 +1,44 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import FormDefault from "./FormDefault";
-import { ActiveOutputs } from "components/Workflow/Editor/modules/outputs";
+import { createTestingPinia } from "@pinia/testing";
+import { PiniaVuePlugin } from "pinia";
 
 const localVue = getLocalVue();
+localVue.use(PiniaVuePlugin);
 
 describe("FormDefault", () => {
     let wrapper;
-    const activeOutputs = new ActiveOutputs();
     const outputs = [
         { name: "output-name", label: "output-label" },
         { name: "other-name", label: "other-label" },
     ];
 
     beforeEach(() => {
-        activeOutputs.initialize(outputs);
         wrapper = mount(FormDefault, {
             propsData: {
                 datatypes: [],
-                getManager: () => {
-                    return {
-                        nodes: [],
-                    };
-                },
-                nodeId: "id",
-                nodeContentId: "id",
-                nodeLabel: "label",
-                nodeName: "node-title",
-                nodeType: "subworkflow",
-                nodeOutputs: outputs,
-                nodeActiveOutputs: activeOutputs,
-                configForm: {
+                step: {
+                    id: 0,
+                    contentId: "id",
+                    annotation: "annotation",
+                    label: "label",
+                    type: "subworkflow",
+                    configForm: {
+                        inputs: [],
+                    },
                     inputs: [],
+                    outputs,
                 },
             },
             localVue,
+            pinia: createTestingPinia(),
         });
     });
 
     it("check initial value and value change", async () => {
         const title = wrapper.find(".portlet-title-text").text();
-        expect(title).toBe("node-title");
+        expect(title).toBe("label");
         const inputCount = wrapper.findAll("input").length;
         expect(inputCount).toBe(3);
         const outputLabelCount = wrapper.findAll("#__label__output-name").length;
diff --git a/client/src/components/Workflow/Editor/Forms/FormDefault.vue b/client/src/components/Workflow/Editor/Forms/FormDefault.vue
index 2dba36a8b7b..9f3f77f78c4 100644
--- a/client/src/components/Workflow/Editor/Forms/FormDefault.vue
+++ b/client/src/components/Workflow/Editor/Forms/FormDefault.vue
@@ -1,5 +1,5 @@
 <template>
-    <FormCard :title="nodeName" :icon="nodeIcon">
+    <FormCard :title="stepTitle" :icon="nodeIcon">
         <template v-slot:operations>
             <b-button
                 v-if="isSubworkflow"
@@ -27,135 +27,79 @@
         <template v-slot:body>
             <FormElement
                 id="__label"
-                :value="nodeLabel"
+                :value="label"
                 title="Label"
                 help="Add a step label."
-                :error="errorLabel"
+                :error="uniqueErrorLabel"
                 @input="onLabel" />
             <FormElement
                 id="__annotation"
-                :value="nodeAnnotation"
+                :value="annotation"
                 title="Step Annotation"
                 :area="true"
                 help="Add an annotation or notes to this step. Annotations are available when a workflow is viewed."
                 @input="onAnnotation" />
-            <FormDisplay :id="id" :inputs="inputs" @onChange="onChange" />
+            <FormDisplay
+                v-if="configForm?.inputs"
+                :id="formDisplayId"
+                :inputs="configForm.inputs"
+                @onChange="onChange" />
             <div v-if="isSubworkflow">
                 <FormOutputLabel
-                    v-for="(output, index) in nodeOutputs"
+                    v-for="(output, index) in step.outputs"
                     :key="index"
                     :name="output.name"
-                    :active-outputs="nodeActiveOutputs"
+                    :step="step"
                     :show-details="true" />
             </div>
         </template>
     </FormCard>
 </template>
 
-<script>
-import FormDisplay from "components/Form/FormDisplay";
-import FormCard from "components/Form/FormCard";
-import FormElement from "components/Form/FormElement";
-import FormOutputLabel from "./FormOutputLabel";
-import { checkLabels } from "components/Workflow/Editor/modules/utilities";
-import WorkflowIcons from "components/Workflow/icons";
+<script lang="ts" setup>
+import FormDisplay from "@/components/Form/FormDisplay.vue";
+import FormCard from "@/components/Form/FormCard.vue";
+import FormElement from "@/components/Form/FormElement.vue";
+import FormOutputLabel from "@/components/Workflow/Editor/Forms/FormOutputLabel.vue";
+import WorkflowIcons from "@/components/Workflow/icons";
+import { useWorkflowStepStore, type Step } from "@/stores/workflowStepStore";
+import { useUniqueLabelError } from "../composables/useUniqueLabelError";
+import { computed, toRef } from "vue";
+import type { DatatypesMapperModel } from "@/components/Datatypes/model";
+import { useStepProps } from "../composables/useStepProps";
 
-export default {
-    components: {
-        FormDisplay,
-        FormCard,
-        FormElement,
-        FormOutputLabel,
-    },
-    props: {
-        nodeName: {
-            type: String,
-            required: true,
-        },
-        nodeId: {
-            type: String,
-            required: true,
-        },
-        nodeContentId: {
-            type: String,
-            required: true,
-        },
-        nodeAnnotation: {
-            type: String,
-            required: false,
-        },
-        nodeLabel: {
-            type: String,
-            required: true,
-        },
-        nodeType: {
-            type: String,
-            required: true,
-        },
-        nodeActiveOutputs: {
-            type: Object,
-            required: true,
-        },
-        nodeOutputs: {
-            type: Array,
-            required: true,
-        },
-        configForm: {
-            type: Object,
-            required: true,
-        },
-        datatypes: {
-            type: Array,
-            required: true,
-        },
-        getManager: {
-            type: Function,
-            required: true,
-        },
-    },
-    computed: {
-        nodeIcon() {
-            return WorkflowIcons[this.nodeType];
-        },
-        workflow() {
-            return this.getManager();
-        },
-        id() {
-            return this.nodeId;
-        },
-        inputs() {
-            return this.configForm.inputs;
-        },
-        isSubworkflow() {
-            return this.nodeType == "subworkflow";
-        },
-        errorLabel() {
-            return checkLabels(this.nodeId, this.nodeLabel, this.workflow.nodes);
-        },
-    },
-    methods: {
-        onAnnotation(newAnnotation) {
-            this.$emit("onAnnotation", this.nodeId, newAnnotation);
-        },
-        onLabel(newLabel) {
-            this.$emit("onLabel", this.nodeId, newLabel);
-        },
-        onEditSubworkflow() {
-            this.$emit("onEditSubworkflow", this.nodeContentId);
-        },
-        onUpgradeSubworkflow() {
-            this.$emit("onAttemptRefactor", [
-                { action_type: "upgrade_subworkflow", step: { order_index: parseInt(this.nodeId) } },
-            ]);
-        },
-        onChange(values) {
-            this.$emit("onSetData", this.nodeId, {
-                id: this.nodeId,
-                type: this.nodeType,
-                content_id: this.nodeContentId,
-                inputs: values,
-            });
-        },
-    },
-};
+const props = defineProps<{
+    step: Step;
+    datatypes: DatatypesMapperModel["datatypes"];
+}>();
+const emit = defineEmits(["onAnnotation", "onLabel", "onAttemptRefactor", "onEditSubworkflow", "onSetData"]);
+const stepRef = toRef(props, "step");
+const { stepId, contentId, annotation, label, name, type, configForm } = useStepProps(stepRef);
+const stepStore = useWorkflowStepStore();
+const uniqueErrorLabel = useUniqueLabelError(stepStore, label?.value);
+const stepTitle = computed(() => (label?.value || contentId?.value || name.value)!);
+const nodeIcon = computed(() => WorkflowIcons[type.value]);
+const formDisplayId = computed(() => stepId.value.toString());
+const isSubworkflow = computed(() => type.value === "subworkflow");
+
+function onAnnotation(newAnnotation: string) {
+    emit("onAnnotation", stepId.value, newAnnotation);
+}
+function onLabel(newLabel: string) {
+    emit("onLabel", stepId.value, newLabel);
+}
+function onEditSubworkflow() {
+    emit("onEditSubworkflow", contentId!.value);
+}
+function onUpgradeSubworkflow() {
+    emit("onAttemptRefactor", [{ action_type: "upgrade_subworkflow", step: { order_index: stepId.value } }]);
+}
+function onChange(values: any) {
+    emit("onSetData", stepId.value, {
+        id: stepId.value,
+        type: type.value,
+        content_id: contentId!.value,
+        inputs: values,
+    });
+}
 </script>
diff --git a/client/src/components/Workflow/Editor/Forms/FormOutput.vue b/client/src/components/Workflow/Editor/Forms/FormOutput.vue
index 7d3d87a7944..12e858b61d2 100644
--- a/client/src/components/Workflow/Editor/Forms/FormOutput.vue
+++ b/client/src/components/Workflow/Editor/Forms/FormOutput.vue
@@ -1,7 +1,7 @@
 <template>
     <FormCard :title="outputTitle" collapsible :expanded.sync="expanded">
         <template v-slot:body>
-            <FormOutputLabel :name="outputName" :active-outputs="activeOutputs" />
+            <FormOutputLabel :name="outputName" :step="step" />
             <FormElement
                 :id="actionNames.RenameDatasetAction__newname"
                 :value="formData[actionNames.RenameDatasetAction__newname]"
@@ -81,9 +81,10 @@
 </template>
 
 <script>
-import FormCard from "components/Form/FormCard";
-import FormElement from "components/Form/FormElement";
-import FormOutputLabel from "./FormOutputLabel";
+import FormCard from "@/components/Form/FormCard";
+import FormElement from "@/components/Form/FormElement";
+import FormOutputLabel from "@/components/Workflow/Editor/Forms/FormOutputLabel";
+import { Step } from "@/stores/workflowStepStore";
 
 const actions = [
     "RenameDatasetAction__newname",
@@ -115,10 +116,6 @@ export default {
             type: String,
             default: null,
         },
-        outputLabelError: {
-            type: String,
-            required: null,
-        },
         inputs: {
             type: Array,
             required: true,
@@ -131,8 +128,8 @@ export default {
             type: Object,
             required: true,
         },
-        activeOutputs: {
-            type: Object,
+        step: {
+            type: Step,
             required: true,
         },
     },
diff --git a/client/src/components/Workflow/Editor/Forms/FormOutputLabel.test.js b/client/src/components/Workflow/Editor/Forms/FormOutputLabel.test.js
index e617720d3f9..b0f9c8fd882 100644
--- a/client/src/components/Workflow/Editor/Forms/FormOutputLabel.test.js
+++ b/client/src/components/Workflow/Editor/Forms/FormOutputLabel.test.js
@@ -1,35 +1,46 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import FormOutputLabel from "./FormOutputLabel";
-import { ActiveOutputs } from "components/Workflow/Editor/modules/outputs";
+import { setActivePinia, PiniaVuePlugin, createPinia } from "pinia";
+
+import { useWorkflowStepStore } from "@/stores/workflowStepStore";
 
 const localVue = getLocalVue();
+localVue.use(PiniaVuePlugin);
 
 describe("FormOutputLabel", () => {
     let wrapper;
     let wrapperOther;
-    const activeOutputs = new ActiveOutputs();
+    let stepStore;
     const outputs = [
         { name: "output-name", label: "output-label" },
         { name: "other-name", label: "other-label" },
     ];
 
     beforeEach(() => {
-        activeOutputs.initialize(outputs);
+        const stepOne = { id: 0, outputs: [{ name: "output-name" }], workflow_outputs: outputs };
+        const pinia = createPinia();
+        setActivePinia(pinia);
         wrapper = mount(FormOutputLabel, {
             propsData: {
                 name: "output-name",
-                activeOutputs: activeOutputs,
+                step: stepOne,
             },
             localVue,
+            pinia,
         });
+        const stepTwo = { id: 1, outputs: [{ name: "other-name" }], workflow_outputs: outputs };
         wrapperOther = mount(FormOutputLabel, {
             propsData: {
                 name: "other-name",
-                activeOutputs: activeOutputs,
+                step: stepTwo,
             },
             localVue,
+            pinia,
         });
+        stepStore = useWorkflowStepStore();
+        stepStore.addStep(stepOne);
+        stepStore.addStep(stepTwo);
     });
 
     it("check initial value and value change", async () => {
@@ -40,11 +51,10 @@ describe("FormOutputLabel", () => {
         const input = wrapper.find("input");
         const inputOther = wrapperOther.find("input");
         await input.setValue("new-label");
-        expect(wrapper.vm.error).toBe(null);
-        expect(activeOutputs.get("output-name").label).toBe("new-label");
+        expect(wrapper.find(".ui-form-error").exists()).toBe(false);
         await inputOther.setValue("other-label");
         await input.setValue("other-label");
-        expect(wrapper.vm.error).toBe("Duplicate output label 'other-label' will be ignored.");
-        expect(activeOutputs.get("output-name").label).toBe("new-label");
+        expect(wrapper.find(".ui-form-error").text()).toBe("Duplicate output label 'other-label' will be ignored.");
+        expect(stepStore.workflowOutputs["new-label"].outputName).toBe("output-name");
     });
 });
diff --git a/client/src/components/Workflow/Editor/Forms/FormOutputLabel.vue b/client/src/components/Workflow/Editor/Forms/FormOutputLabel.vue
index f6a22d05dff..4ff135742a1 100644
--- a/client/src/components/Workflow/Editor/Forms/FormOutputLabel.vue
+++ b/client/src/components/Workflow/Editor/Forms/FormOutputLabel.vue
@@ -9,56 +9,54 @@
         @input="onInput" />
 </template>
 
-<script>
-import FormElement from "components/Form/FormElement";
+<script lang="ts" setup>
+import FormElement from "@/components/Form/FormElement.vue";
+import { useWorkflowStepStore } from "@/stores/workflowStepStore";
+import { computed, ref } from "vue";
+import type { Ref } from "vue";
+import type { Step } from "@/stores/workflowStepStore";
 
-export default {
-    components: {
-        FormElement,
-    },
-    props: {
-        name: {
-            type: String,
-            required: true,
-        },
-        showDetails: {
-            type: Boolean,
-            default: false,
-        },
-        activeOutputs: {
-            type: Object,
-            default: null,
-        },
-    },
-    data() {
-        return {
-            error: null,
-        };
-    },
-    computed: {
-        id() {
-            return `__label__${this.name}`;
-        },
-        title() {
-            if (this.showDetails) {
-                return `Label for: '${this.name}'`;
-            } else {
-                return "Label";
-            }
-        },
-        label() {
-            const activeOutput = this.activeOutputs.get(this.name);
-            return activeOutput && activeOutput.label;
-        },
-    },
-    methods: {
-        onInput(newLabel) {
-            if (this.activeOutputs.labelOutput(this.name, newLabel)) {
-                this.error = null;
-            } else {
-                this.error = `Duplicate output label '${newLabel}' will be ignored.`;
-            }
-        },
-    },
-};
+const props = withDefaults(
+    defineProps<{
+        name: string;
+        step: Step;
+        showDetails?: boolean;
+    }>(),
+    {
+        showDetails: false,
+    }
+);
+
+const stepStore = useWorkflowStepStore();
+
+const error: Ref<string | undefined> = ref(undefined);
+const id = computed(() => `__label__${props.name}`);
+const title = computed(() => (props.showDetails ? `Label for: '${props.name}'` : "Label"));
+const label = computed(() => {
+    if (props.step.workflow_outputs?.length) {
+        const workflowOutput = props.step.workflow_outputs.find(
+            (workflowOutput) => workflowOutput.output_name === props.name
+        );
+        if (workflowOutput) {
+            return workflowOutput.label;
+        }
+    }
+    return null;
+});
+
+function onInput(newLabel: string) {
+    if (!stepStore.workflowOutputs[newLabel]) {
+        const newWorkflowOutputs = [...(props.step.workflow_outputs || [])].filter(
+            (workflowOutput) => workflowOutput.output_name !== props.name
+        );
+        newWorkflowOutputs.push({
+            label: newLabel,
+            output_name: props.name,
+        });
+        stepStore.updateStep({ ...props.step, workflow_outputs: newWorkflowOutputs });
+        error.value = undefined;
+    } else {
+        error.value = `Duplicate output label '${newLabel}' will be ignored.`;
+    }
+}
 </script>
diff --git a/client/src/components/Workflow/Editor/Forms/FormSection.vue b/client/src/components/Workflow/Editor/Forms/FormSection.vue
index a31563fe3bf..b924842cd71 100644
--- a/client/src/components/Workflow/Editor/Forms/FormSection.vue
+++ b/client/src/components/Workflow/Editor/Forms/FormSection.vue
@@ -18,7 +18,7 @@
             v-for="(output, index) in outputs"
             :key="index"
             :output-name="output.name"
-            :active-outputs="nodeActiveOutputs"
+            :step="step"
             :inputs="nodeInputs"
             :datatypes="datatypes"
             :form-data="formData"
@@ -28,8 +28,9 @@
 </template>
 
 <script>
-import FormElement from "components/Form/FormElement";
-import FormOutput from "./FormOutput";
+import FormElement from "@/components/Form/FormElement";
+import FormOutput from "@/components/Workflow/Editor/Forms/FormOutput";
+import { Step } from "@/stores/workflowStepStore";
 
 export default {
     components: {
@@ -38,7 +39,7 @@ export default {
     },
     props: {
         id: {
-            type: String,
+            type: Number,
             required: true,
         },
         nodeInputs: {
@@ -49,8 +50,8 @@ export default {
             type: Array,
             required: true,
         },
-        nodeActiveOutputs: {
-            type: Object,
+        step: {
+            type: Step,
             required: true,
         },
         datatypes: {
@@ -138,7 +139,6 @@ export default {
             if (pjas[this.emailPayloadKey]) {
                 pjas[this.emailActionKey] = true;
             }
-            console.debug("FormSection - Setting new data.", this.postJobActions, pjas);
             this.formData = pjas;
         },
         setEmailAction(pjas) {
diff --git a/client/src/components/Workflow/Editor/Forms/FormTool.test.js b/client/src/components/Workflow/Editor/Forms/FormTool.test.js
index aa5b7afe289..2db5af07c0e 100644
--- a/client/src/components/Workflow/Editor/Forms/FormTool.test.js
+++ b/client/src/components/Workflow/Editor/Forms/FormTool.test.js
@@ -1,11 +1,12 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue, mockModule } from "jest/helpers";
+import { getLocalVue, mockModule } from "tests/jest/helpers";
 import FormTool from "./FormTool";
 import MockCurrentUser from "components/providers/MockCurrentUser";
 import MockConfigProvider from "components/providers/MockConfigProvider";
 import Vuex from "vuex";
 import { userStore } from "store/userStore";
 import { configStore } from "store/configStore";
+import { createTestingPinia } from "@pinia/testing";
 
 const localVue = getLocalVue();
 
@@ -24,25 +25,21 @@ describe("FormTool", () => {
             propsData: {
                 id: "input",
                 datatypes: [],
-                configForm: {
-                    id: "tool_id+1.0",
-                    name: "tool_name",
-                    version: "1.0",
-                    description: "description",
+                step: {
+                    id: 0,
+                    config_form: {
+                        id: "tool_id+1.0",
+                        name: "tool_name",
+                        version: "1.0",
+                        description: "description",
+                        inputs: [],
+                        help: "help_text",
+                        versions: ["1.0", "2.0", "3.0"],
+                        citations: false,
+                    },
+                    outputs: [],
                     inputs: [],
-                    help: "help_text",
-                    versions: ["1.0", "2.0", "3.0"],
-                    hasCitations: false,
-                },
-                nodeId: "id",
-                nodeAnnotation: "",
-                nodeLabel: "",
-                nodeInputs: [],
-                nodeOutputs: [],
-                nodeActiveOutputs: {},
-                postJobActions: {},
-                getManager: () => {
-                    return {};
+                    post_job_actions: {},
                 },
             },
             localVue,
@@ -52,6 +49,7 @@ describe("FormTool", () => {
                 FormElement: { template: "<div>form-element</div>" },
                 ToolFooter: { template: "<div>tool-footer</div>" },
             },
+            pinia: createTestingPinia(),
             provide: { store },
         });
     });
diff --git a/client/src/components/Workflow/Editor/Forms/FormTool.vue b/client/src/components/Workflow/Editor/Forms/FormTool.vue
index 628703fc7a6..160613d9904 100644
--- a/client/src/components/Workflow/Editor/Forms/FormTool.vue
+++ b/client/src/components/Workflow/Editor/Forms/FormTool.vue
@@ -15,14 +15,14 @@
             <template v-slot:body>
                 <FormElement
                     id="__label"
-                    :value="nodeLabel"
+                    :value="label"
                     title="Label"
                     help="Add a step label."
-                    :error="errorLabel"
+                    :error="uniqueErrorLabel"
                     @input="onLabel" />
                 <FormElement
                     id="__annotation"
-                    :value="nodeAnnotation"
+                    :value="annotation"
                     title="Step Annotation"
                     :area="true"
                     help="Add an annotation or notes to this step. Annotations are available when a workflow is viewed."
@@ -41,10 +41,10 @@
                 <div class="mt-2 mb-4">
                     <Heading h2 separator bold size="sm"> Additional Options </Heading>
                     <FormSection
-                        :id="nodeId"
-                        :node-inputs="nodeInputs"
-                        :node-outputs="nodeOutputs"
-                        :node-active-outputs="nodeActiveOutputs"
+                        :id="stepId"
+                        :node-inputs="stepInputs"
+                        :node-outputs="stepOutputs"
+                        :step="step"
                         :datatypes="datatypes"
                         :post-job-actions="postJobActions"
                         @onChange="onChangePostJobActions" />
@@ -60,9 +60,12 @@ import FormDisplay from "components/Form/FormDisplay";
 import ToolCard from "components/Tool/ToolCard";
 import FormSection from "./FormSection";
 import FormElement from "components/Form/FormElement";
-import { checkLabels } from "components/Workflow/Editor/modules/utilities";
 import Utils from "utils/utils";
 import Heading from "components/Common/Heading";
+import { useWorkflowStepStore, Step } from "@/stores/workflowStepStore";
+import { useUniqueLabelError } from "../composables/useUniqueLabelError";
+import { useStepProps } from "../composables/useStepProps";
+import { toRef } from "vue";
 
 export default {
     components: {
@@ -74,46 +77,22 @@ export default {
         Heading,
     },
     props: {
-        nodeId: {
-            type: String,
-            required: true,
-        },
-        nodeAnnotation: {
-            type: String,
-            required: true,
-        },
-        nodeLabel: {
-            type: String,
-            required: true,
-        },
-        nodeInputs: {
-            type: Array,
-            required: true,
-        },
-        nodeOutputs: {
-            type: Array,
-            required: true,
-        },
-        nodeActiveOutputs: {
-            type: Object,
-            required: true,
-        },
-        configForm: {
-            type: Object,
+        step: {
+            type: Step,
             required: true,
         },
         datatypes: {
             type: Array,
             required: true,
         },
-        getManager: {
-            type: Function,
-            required: true,
-        },
-        postJobActions: {
-            type: Object,
-            required: true,
-        },
+    },
+    setup(props) {
+        const { stepId, annotation, label, stepInputs, stepOutputs, configForm, postJobActions } = useStepProps(
+            toRef(props, "step")
+        );
+        const stepStore = useWorkflowStepStore();
+        const uniqueErrorLabel = useUniqueLabelError(stepStore, label);
+        return { stepId, annotation, label, stepInputs, stepOutputs, configForm, postJobActions, uniqueErrorLabel };
     },
     data() {
         return {
@@ -123,17 +102,14 @@ export default {
         };
     },
     computed: {
-        workflow() {
-            return this.getManager();
-        },
         id() {
-            return `${this.nodeId}:${this.configForm.id}`;
+            return `${this.stepId}:${this.configForm.id}`;
+        },
+        toolCardId() {
+            return `${this.stepId}`;
         },
         hasData() {
-            return !!this.configForm;
-        },
-        errorLabel() {
-            return checkLabels(this.nodeId, this.nodeLabel, this.workflow.nodes);
+            return !!this.configForm?.id;
         },
         inputs() {
             const inputs = this.configForm.inputs;
@@ -168,17 +144,17 @@ export default {
     },
     methods: {
         onAnnotation(newAnnotation) {
-            this.$emit("onAnnotation", this.nodeId, newAnnotation);
+            this.$emit("onAnnotation", this.stepId, newAnnotation);
         },
         onLabel(newLabel) {
-            this.$emit("onLabel", this.nodeId, newLabel);
+            this.$emit("onLabel", this.stepId, newLabel);
         },
         onChange(values) {
             this.mainValues = values;
             this.postChanges();
         },
         onChangePostJobActions(postJobActions) {
-            this.$emit("onChangePostJobActions", this.nodeId, postJobActions);
+            this.$emit("onChangePostJobActions", this.stepId, postJobActions);
         },
         onChangeVersion(newVersion) {
             this.messageText = `Now you are using '${this.configForm.name}' version ${newVersion}.`;
@@ -189,16 +165,14 @@ export default {
         },
         postChanges(newVersion) {
             const payload = Object.assign({}, this.mainValues);
-            console.debug("FormTool - Posting changes.", payload);
             const options = this.configForm;
             let toolId = options.id;
             let toolVersion = options.version;
             if (newVersion) {
                 toolId = toolId.replace(toolVersion, newVersion);
                 toolVersion = newVersion;
-                console.debug("FormTool - Tool version changed.", toolId, toolVersion);
             }
-            this.$emit("onSetData", this.nodeId, {
+            this.$emit("onSetData", this.stepId, {
                 tool_id: toolId,
                 tool_version: toolVersion,
                 type: "tool",
diff --git a/client/src/components/Workflow/Editor/Index.test.js b/client/src/components/Workflow/Editor/Index.test.ts
similarity index 52%
rename from client/src/components/Workflow/Editor/Index.test.js
rename to client/src/components/Workflow/Editor/Index.test.ts
index 307d6e89ae5..4d3c3170883 100644
--- a/client/src/components/Workflow/Editor/Index.test.js
+++ b/client/src/components/Workflow/Editor/Index.test.ts
@@ -1,39 +1,47 @@
+import { expect, jest } from "@jest/globals";
+
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
-import Index from "./Index";
+import { getLocalVue } from "tests/jest/helpers";
+import { PiniaVuePlugin } from "pinia";
+import { setActivePinia } from "pinia";
+import { createTestingPinia } from "@pinia/testing";
+
+import Index from "./Index.vue";
 
 const localVue = getLocalVue();
+localVue.use(PiniaVuePlugin);
 
 jest.mock("components/Datatypes/factory");
 jest.mock("./modules/services");
 jest.mock("layout/modal");
 jest.mock("onload/loadConfig");
 jest.mock("./modules/utilities");
-jest.mock("./modules/canvas");
 
 jest.mock("app");
 
-import { getDatatypesMapper } from "components/Datatypes/factory";
-import { testDatatypesMapper } from "components/Datatypes/test_fixtures";
-import { getVersions, loadWorkflow } from "./modules/services";
+import { testDatatypesMapper } from "@/components/Datatypes/test_fixtures";
+import { loadWorkflow, getVersions } from "./modules/services";
 import { getStateUpgradeMessages } from "./modules/utilities";
-import { getAppRoot } from "onload/loadConfig";
-import WorkflowCanvas from "./modules/canvas";
+import { getAppRoot } from "@/onload/loadConfig";
+import { useDatatypesMapperStore } from "@/stores/datatypesMapperStore";
 
-getAppRoot.mockImplementation(() => "prefix/");
+const mockGetAppRoot = getAppRoot as jest.Mocked<typeof getAppRoot>;
+const mockGetStateUpgradeMessages = getStateUpgradeMessages as jest.Mock<typeof getStateUpgradeMessages>;
+const mockLoadWorkflow = loadWorkflow as jest.Mocked<typeof loadWorkflow>;
+const MockGetVersions = getVersions as jest.Mocked<typeof getVersions>;
 
 describe("Index", () => {
-    let wrapper;
+    let wrapper: any; // don't know how to add type hints here, see https://github.com/vuejs/vue-test-utils/issues/255
 
     beforeEach(() => {
-        getDatatypesMapper.mockResolvedValue(testDatatypesMapper);
-        getStateUpgradeMessages.mockImplementation(() => []);
-        getVersions.mockResolvedValue((id) => []);
-        WorkflowCanvas.mockClear();
-    });
-
-    async function mountAndWaitForCreated(workflow = {}) {
-        loadWorkflow.mockResolvedValue(workflow);
+        const testingPinia = createTestingPinia();
+        setActivePinia(testingPinia);
+        const datatypesStore = useDatatypesMapperStore();
+        datatypesStore.datatypesMapper = testDatatypesMapper;
+        mockLoadWorkflow.mockResolvedValue({ steps: {} });
+        MockGetVersions.mockResolvedValue(() => []);
+        mockGetStateUpgradeMessages.mockImplementation(() => []);
+        mockGetAppRoot.mockImplementation(() => "prefix/");
         Object.defineProperty(window, "onbeforeunload", {
             value: null,
             writable: true,
@@ -49,25 +57,21 @@ describe("Index", () => {
                 toolbox: [],
             },
             localVue,
+            pinia: testingPinia,
         });
-        await wrapper.vm.$nextTick();
-        expect(WorkflowCanvas).toHaveBeenCalledTimes(1);
-    }
+    });
 
     async function resetChanges() {
         wrapper.vm.hasChanges = false;
         await wrapper.vm.$nextTick();
     }
 
-    it("resolved datatypes", async () => {
-        mountAndWaitForCreated();
+    it("resolves datatypes", async () => {
         expect(wrapper.datatypesMapper).not.toBeNull();
         expect(wrapper.datatypes).not.toBeNull();
-        expect(wrapper.canvasManager).not.toBeNull();
     });
 
-    it("routes to run to download URL and respects Galaxy prefix", async () => {
-        mountAndWaitForCreated();
+    it("routes to download URL and respects Galaxy prefix", async () => {
         Object.defineProperty(window, "location", {
             value: "original",
             writable: true,
@@ -77,37 +81,40 @@ describe("Index", () => {
     });
 
     it("tracks changes to annotations", async () => {
-        mountAndWaitForCreated();
         expect(wrapper.vm.hasChanges).toBeFalsy();
-        await wrapper.setData({ annotation: "original annotation" });
+        wrapper.vm.annotation = "original annotation";
+        await wrapper.vm.$nextTick();
         expect(wrapper.vm.hasChanges).toBeTruthy();
 
         resetChanges();
 
-        await wrapper.setData({ annotation: "original annotation" });
+        wrapper.vm.annotation = "original annotation";
+        await wrapper.vm.$nextTick();
         expect(wrapper.vm.hasChanges).toBeFalsy();
 
-        await wrapper.setData({ annotation: "new annotation" });
+        wrapper.vm.annotation = "new annotation";
+        await wrapper.vm.$nextTick();
         expect(wrapper.vm.hasChanges).toBeTruthy();
     });
 
     it("tracks changes to name", async () => {
-        mountAndWaitForCreated();
         expect(wrapper.hasChanges).toBeFalsy();
-        await wrapper.setData({ name: "original name" });
+        wrapper.vm.name = "original name";
+        await wrapper.vm.$nextTick();
         expect(wrapper.vm.hasChanges).toBeTruthy();
 
         resetChanges();
 
-        await wrapper.setData({ name: "original name" });
+        wrapper.vm.name = "original name";
+        await wrapper.vm.$nextTick();
         expect(wrapper.vm.hasChanges).toBeFalsy();
 
-        await wrapper.setData({ name: "new name" });
+        wrapper.vm.name = "new name";
+        await wrapper.vm.$nextTick();
         expect(wrapper.vm.hasChanges).toBeTruthy();
     });
 
     it("prevents navigation only if hasChanges", async () => {
-        mountAndWaitForCreated();
         expect(wrapper.vm.hasChanges).toBeFalsy();
         await wrapper.vm.onChange();
         const confirmationRequired = wrapper.emitted()["update:confirmation"][0][0];
diff --git a/client/src/components/Workflow/Editor/Index.vue b/client/src/components/Workflow/Editor/Index.vue
index 3ccc36cad64..872af56a6de 100644
--- a/client/src/components/Workflow/Editor/Index.vue
+++ b/client/src/components/Workflow/Editor/Index.vue
@@ -31,7 +31,7 @@
             :markdown-text="markdownText"
             :markdown-config="markdownConfig"
             :title="'Workflow Report: ' + name"
-            :get-manager="getManager"
+            :steps="steps"
             @onUpdate="onReportUpdate">
             <template v-slot:buttons>
                 <b-button
@@ -65,50 +65,24 @@
                         {{ name }}
                     </div>
                 </div>
-                <div id="workflow-canvas" class="unified-panel-body workflow-canvas">
-                    <ZoomControl v-if="!checkWheeled" :zoom-level="zoomLevel" @onZoom="onZoom" />
-                    <b-button
-                        v-else
-                        v-b-tooltip.hover
-                        class="reset-wheel"
-                        variant="light"
-                        title="Show Zoom Buttons"
-                        size="sm"
-                        aria-label="Show Zoom Buttons"
-                        @click="resetWheel">
-                        Zoom Controls
-                    </b-button>
-                    <div id="canvas-viewport">
-                        <div id="canvas-container" ref="canvas">
-                            <WorkflowNode
-                                v-for="(step, key) in steps"
-                                :id="key"
-                                :key="key"
-                                :name="step.name"
-                                :type="step.type"
-                                :content-id="step.content_id"
-                                :step="step"
-                                :datatypes-mapper="datatypesMapper"
-                                :get-manager="getManager"
-                                :get-canvas-manager="getCanvasManager"
-                                @onAdd="onAdd"
-                                @onUpdate="onUpdate"
-                                @onClone="onClone"
-                                @onCreate="onInsertTool"
-                                @onChange="onChange"
-                                @onActivate="onActivate"
-                                @onRemove="onRemove" />
-                        </div>
-                    </div>
-                    <div class="workflow-overview" aria-hidden="true">
-                        <div class="workflow-overview-body">
-                            <div id="overview-container">
-                                <canvas id="overview-canvas" width="0" height="0" />
-                                <div id="overview-viewport" />
-                            </div>
-                        </div>
-                    </div>
-                </div>
+                <workflow-graph
+                    v-if="!datatypesMapperLoading"
+                    :steps="steps"
+                    :datatypes-mapper="datatypesMapper"
+                    :highlight-id="highlightId"
+                    :scroll-to-id="scrollToId"
+                    @scrollTo="scrollToId = null"
+                    @transform="(value) => (transform = value)"
+                    @graph-offset="(value) => (graphOffset = value)"
+                    @onUpdate="onUpdate"
+                    @onClone="onClone"
+                    @onCreate="onInsertTool"
+                    @onChange="onChange"
+                    @onConnect="onConnect"
+                    @onRemove="onRemove"
+                    @onUpdateStep="onUpdateStep"
+                    @onUpdateStepPosition="onUpdateStepPosition">
+                </workflow-graph>
             </div>
             <SidePanel id="right" side="right">
                 <template v-slot:panel>
@@ -133,33 +107,15 @@
                             <div>
                                 <FormTool
                                     v-if="hasActiveNodeTool"
-                                    :key="activeNodeId"
-                                    :get-manager="getManager"
-                                    :node-id="activeNodeId"
-                                    :node-annotation="activeNodeAnnotation"
-                                    :node-label="activeNodeLabel"
-                                    :node-inputs="activeNodeInputs"
-                                    :node-outputs="activeNodeOutputs"
-                                    :node-active-outputs="activeNodeActiveOutputs"
-                                    :config-form="activeNodeConfigForm"
+                                    :step="activeStep"
                                     :datatypes="datatypes"
-                                    :post-job-actions="postJobActions"
                                     @onChangePostJobActions="onChangePostJobActions"
                                     @onAnnotation="onAnnotation"
                                     @onLabel="onLabel"
                                     @onSetData="onSetData" />
                                 <FormDefault
                                     v-else-if="hasActiveNodeDefault"
-                                    :node-name="activeNodeName"
-                                    :node-id="activeNodeId"
-                                    :node-content-id="activeNodeContentId"
-                                    :node-annotation="activeNodeAnnotation"
-                                    :node-label="activeNodeLabel"
-                                    :node-type="activeNodeType"
-                                    :node-outputs="activeNodeOutputs"
-                                    :node-active-outputs="activeNodeActiveOutputs"
-                                    :config-form="activeNodeConfigForm"
-                                    :get-manager="getManager"
+                                    :step="activeStep"
                                     :datatypes="datatypes"
                                     @onAnnotation="onAnnotation"
                                     @onLabel="onLabel"
@@ -188,7 +144,8 @@
                                     :annotation="annotation"
                                     :creator="creator"
                                     :license="license"
-                                    :get-manager="getManager"
+                                    :steps="steps"
+                                    :datatypes-mapper="datatypesMapper"
                                     @onAttributes="onAttributes"
                                     @onHighlight="onHighlight"
                                     @onUnhighlight="onUnhighlight"
@@ -205,31 +162,35 @@
 
 <script>
 import axios from "axios";
-import { LastQueue } from "utils/promise-queue";
-import { getDatatypesMapper } from "components/Datatypes";
+import { LastQueue } from "@/utils/promise-queue";
 import { fromSimple, toSimple } from "./modules/model";
 import { getModule, getVersions, saveWorkflow, loadWorkflow } from "./modules/services";
-import { getUntypedWorkflowParameters } from "./modules/parameters";
+import { getUntypedWorkflowParameters } from "@/components/Workflow/Editor/modules/parameters";
 import { getStateUpgradeMessages } from "./modules/utilities";
-import WorkflowCanvas from "./modules/canvas";
-import WorkflowOptions from "./Options";
-import FormDefault from "./Forms/FormDefault";
-import FormTool from "./Forms/FormTool";
-import MarkdownEditor from "components/Markdown/MarkdownEditor";
-import ProviderAwareToolBoxWorkflow from "components/Panels/ProviderAwareToolBoxWorkflow";
-import SidePanel from "components/Panels/SidePanel";
-import { getAppRoot } from "onload/loadConfig";
+import WorkflowOptions from "./Options.vue";
+import FormDefault from "@/components/Workflow/Editor/Forms/FormDefault.vue";
+import FormTool from "@/components/Workflow/Editor/Forms/FormTool.vue";
+import MarkdownEditor from "@/components/Markdown/MarkdownEditor.vue";
+import ProviderAwareToolBoxWorkflow from "@/components/Panels/ProviderAwareToolBoxWorkflow.vue";
+import SidePanel from "@/components/Panels/SidePanel.vue";
+import { getAppRoot } from "@/onload/loadConfig";
 import reportDefault from "./reportDefault";
-import WorkflowLint from "./Lint";
-import StateUpgradeModal from "./StateUpgradeModal";
-import RefactorConfirmationModal from "./RefactorConfirmationModal";
-import MessagesModal from "./MessagesModal";
-import { hide_modal } from "layout/modal";
-import WorkflowAttributes from "./Attributes";
-import ZoomControl from "./ZoomControl";
-import WorkflowNode from "./Node";
-import Vue from "vue";
-import { ConfirmDialog } from "composables/confirmDialog";
+import WorkflowLint from "./Lint.vue";
+import StateUpgradeModal from "./StateUpgradeModal.vue";
+import RefactorConfirmationModal from "./RefactorConfirmationModal.vue";
+import MessagesModal from "./MessagesModal.vue";
+import { hide_modal } from "@/layout/modal";
+import WorkflowAttributes from "./Attributes.vue";
+import WorkflowGraph from "./WorkflowGraph.vue";
+import { defaultPosition } from "./composables/useDefaultStepPosition";
+import { useConnectionStore } from "@/stores/workflowConnectionStore";
+
+import Vue, { onUnmounted, computed } from "vue";
+import { ConfirmDialog } from "@/composables/confirmDialog";
+import { useWorkflowStepStore } from "@/stores/workflowStepStore";
+import { useWorkflowStateStore } from "@/stores/workflowEditorStateStore";
+import { storeToRefs } from "pinia";
+import { useDatatypesMapper } from "@/composables/datatypesMapper";
 
 export default {
     components: {
@@ -241,11 +202,10 @@ export default {
         FormTool,
         WorkflowOptions,
         WorkflowAttributes,
-        ZoomControl,
-        WorkflowNode,
         WorkflowLint,
         RefactorConfirmationModal,
         MessagesModal,
+        WorkflowGraph,
     },
     props: {
         id: {
@@ -273,6 +233,42 @@ export default {
             required: true,
         },
     },
+    setup() {
+        const { datatypes, datatypesMapper, datatypesMapperLoading } = useDatatypesMapper();
+        const connectionsStore = useConnectionStore();
+        const stepStore = useWorkflowStepStore();
+        const { getStepIndex, steps } = storeToRefs(stepStore);
+        const stateStore = useWorkflowStateStore();
+        const { activeNodeId } = storeToRefs(stateStore);
+        const activeStep = computed(() => {
+            if (activeNodeId.value !== null) {
+                return stepStore.getStep(activeNodeId.value);
+            }
+            return null;
+        });
+
+        function resetStores() {
+            connectionsStore.$reset();
+            stepStore.$reset();
+            stateStore.$reset();
+        }
+        onUnmounted(() => {
+            resetStores();
+        });
+        return {
+            connectionsStore,
+            stepStore,
+            steps,
+            nodeIndex: getStepIndex,
+            datatypes,
+            activeStep,
+            activeNodeId,
+            datatypesMapper,
+            datatypesMapperLoading,
+            stateStore,
+            resetStores,
+        };
+    },
     data() {
         return {
             isCanvas: true,
@@ -280,15 +276,8 @@ export default {
             markdownText: null,
             versions: [],
             parameters: null,
-            zoomLevel: 7,
-            steps: {},
             hasChanges: false,
-            nodeIndex: 0,
-            nodes: {},
-            datatypesMapper: null,
-            datatypes: [],
             report: {},
-            activeNode: null,
             labels: {},
             license: null,
             creator: null,
@@ -297,16 +286,18 @@ export default {
             stateMessages: [],
             insertedStateMessages: [],
             refactorActions: [],
+            scrollToId: null,
+            highlightId: null,
             messageTitle: null,
             messageBody: null,
             messageIsError: false,
             version: this.initialVersion,
             showInPanel: "attributes",
-            isWheeled: false,
-            canvasManager: null,
             saveAsName: null,
             saveAsAnnotation: null,
             showSaveAsModal: false,
+            transform: { x: 0, y: 0, k: 1 },
+            graphOffset: { left: 0, top: 0, width: 0, height: 0 },
         };
     },
     computed: {
@@ -316,50 +307,14 @@ export default {
         showLint() {
             return this.showInPanel == "lint";
         },
-        postJobActions() {
-            return this.activeNode.postJobActions;
-        },
-        activeNodeId() {
-            return this.activeNode && this.activeNode.id;
-        },
-        activeNodeName() {
-            return this.activeNode?.name;
-        },
-        activeNodeContentId() {
-            return this.activeNode && this.activeNode.contentId;
-        },
-        activeNodeLabel() {
-            return this.activeNode?.label;
-        },
-        activeNodeAnnotation() {
-            return this.activeNode?.annotation;
-        },
-        activeNodeConfigForm() {
-            return this.activeNode?.config_form;
-        },
-        activeNodeInputs() {
-            return this.activeNode?.inputs;
-        },
-        activeNodeOutputs() {
-            return this.activeNode?.outputs;
-        },
-        activeNodeActiveOutputs() {
-            return this.activeNode?.activeOutputs;
-        },
         activeNodeType() {
-            return this.activeNode?.type;
+            return this.activeStep?.type;
         },
         hasActiveNodeDefault() {
-            return this.activeNode && this.activeNode.type != "tool";
+            return this.activeStep && this.activeStep?.type != "tool";
         },
         hasActiveNodeTool() {
-            return this.activeNode && this.activeNode.type == "tool";
-        },
-        checkWheeled() {
-            if (this.canvasManager != null) {
-                return this.canvasManager.isWheeled;
-            }
-            return this.isWheeled;
+            return this.activeStep?.type == "tool";
         },
     },
     watch: {
@@ -381,40 +336,26 @@ export default {
         steps(newSteps, oldSteps) {
             this.hasChanges = true;
         },
-        nodes(newNodes, oldNodes) {
-            this.hasChanges = true;
-        },
         hasChanges() {
             this.$emit("update:confirmation", this.hasChanges);
         },
     },
     created() {
         this.lastQueue = new LastQueue();
-        getDatatypesMapper(false).then((mapper) => {
-            this.datatypesMapper = mapper;
-            this.datatypes = mapper.datatypes;
-
-            // canvas overview management
-            this.canvasManager = new WorkflowCanvas(this, this.$refs.canvas);
-            this._loadCurrent(this.id, this.version);
-        });
+        this._loadCurrent(this.id, this.version);
         hide_modal();
     },
     methods: {
-        onActivate(node) {
-            if (this.activeNode != node) {
-                this.onDeactivate();
-                node.makeActive();
-                this.activeNode = node;
-                this.canvasManager.drawOverview();
-                this.$refs["right-panel"].scrollTop = 0;
-            }
+        onUpdateStep(step) {
+            this.stepStore.updateStep(step);
+            this.hasChanges = true;
         },
-        onDeactivate() {
-            if (this.activeNode) {
-                this.activeNode.makeInactive();
-                this.activeNode = null;
-            }
+        onUpdateStepPosition(stepId, position) {
+            const step = { ...this.steps[stepId], position };
+            this.onUpdateStep(step);
+        },
+        onConnect(connection) {
+            this.connectionsStore.addConnection(connection);
         },
         onAttemptRefactor(actions) {
             if (this.hasChanges) {
@@ -459,76 +400,72 @@ export default {
             hide_modal(); // hide other modals created in utilities also...
         },
         async onRefactor(response) {
-            await fromSimple(this, response.workflow);
+            await fromSimple(response.workflow);
             this._loadEditorData(response.workflow);
         },
-        onAdd(node) {
-            this.nodes[node.id] = node;
-        },
-        onUpdate(node) {
-            getModule({
-                type: node.type,
-                content_id: node.contentId,
-                _: "true",
-            }).then((response) => {
-                const newData = Object.assign({}, response, node.step);
-                newData.workflow_outputs = newData.outputs.map((o) => {
-                    return {
-                        output_name: o.name,
-                        label: o.label,
-                    };
+        onUpdate(step) {
+            getModule(
+                {
+                    type: step.type,
+                    content_id: step.contentId,
+                    _: "true",
+                },
+                this.id,
+                this.stateStore.setLoadingState
+            ).then((response) => {
+                this.onUpdateStep({
+                    ...this.steps[step.id],
+                    config_form: response.config_form,
+                    content_id: response.content_id,
+                    errors: response.errors,
+                    inputs: response.inputs,
+                    outputs: response.outputs,
+                    tool_state: response.tool_state,
                 });
-                node.setNode(newData);
             });
         },
         onChange() {
             this.hasChanges = true;
         },
         onChangePostJobActions(nodeId, postJobActions) {
-            Vue.set(this.nodes[nodeId], "postJobActions", postJobActions);
+            const updatedStep = { ...this.steps[nodeId], post_job_actions: postJobActions };
+            this.stepStore.updateStep(updatedStep);
             this.onChange();
         },
-        onRemove(node) {
-            delete this.nodes[node.id];
-            Vue.delete(this.steps, node.id);
-            this.canvasManager.drawOverview();
-            this.onDeactivate();
+        onRemove(nodeId) {
+            this.stepStore.removeStep(nodeId);
             this.showInPanel = "attributes";
         },
         onEditSubworkflow(contentId) {
             const editUrl = `/workflows/edit?workflow_id=${contentId}`;
             this.onNavigate(editUrl);
         },
-        async onClone(node) {
-            const newId = this.nodeIndex++;
-            const stepCopy = JSON.parse(JSON.stringify(node.step));
-            await Vue.set(this.steps, newId, {
+        async onClone(stepId) {
+            const sourceStep = this.steps[parseInt(stepId)];
+            const stepCopy = JSON.parse(JSON.stringify(sourceStep));
+            const { id } = this.stepStore.addStep({
                 ...stepCopy,
-                id: newId,
+                id: null,
                 uuid: null,
                 label: null,
-                config_form: JSON.parse(JSON.stringify(node.config_form)),
-                annotation: JSON.parse(JSON.stringify(node.annotation)),
-                tool_state: JSON.parse(JSON.stringify(node.tool_state)),
-                post_job_actions: JSON.parse(JSON.stringify(node.postJobActions)),
+                position: defaultPosition(this.graphOffset, this.transform),
             });
-            this.canvasManager.drawOverview();
-            node = this.nodes[newId];
-            this.onActivate(node);
+            this.stateStore.setActiveNode(id);
         },
         onInsertTool(tool_id, tool_name) {
             this._insertStep(tool_id, tool_name, "tool");
         },
         onInsertModule(module_id, module_name) {
-            this._insertStep(null, module_name, module_id);
+            this._insertStep(module_name, module_name, module_id);
         },
         onInsertWorkflow(workflow_id, workflow_name) {
             this._insertStep(workflow_id, workflow_name, "subworkflow");
         },
-        copyIntoWorkflow(id = null) {
+        copyIntoWorkflow(id) {
             // Load workflow definition
             this.onWorkflowMessage("Importing workflow", "progress");
-            loadWorkflow({ workflow: this, id, appendData: true }).then((data) => {
+            loadWorkflow({ id }).then((data) => {
+                fromSimple(data, true, defaultPosition(this.graphOffset, this.transform));
                 // Determine if any parameters were 'upgraded' and provide message
                 const insertedStateMessages = getStateUpgradeMessages(data);
                 this.onInsertedStateMessages(insertedStateMessages);
@@ -579,47 +516,58 @@ export default {
             this.showSaveAsModal = true;
         },
         onLayout() {
-            this.canvasManager.drawOverview();
-            this.canvasManager.scrollToNodes();
-            return import(/* webpackChunkName: "workflowLayout" */ "./modules/layout.js").then((layout) => {
-                layout.autoLayout(this);
+            return import(/* webpackChunkName: "workflowLayout" */ "./modules/layout.ts").then((layout) => {
+                layout.autoLayout(this.steps).then((newSteps) => {
+                    newSteps.map((step) => this.onUpdateStep(step));
+                });
             });
         },
         onAttributes() {
             this._ensureParametersSet();
-            this.onDeactivate();
+            this.stateStore.setActiveNode(null);
+            this.showInPanel = "attributes";
+        },
+        onWorkflowTextEditor() {
+            this.stateStore.setActiveNode(null);
             this.showInPanel = "attributes";
         },
         onAnnotation(nodeId, newAnnotation) {
-            const node = this.nodes[nodeId];
-            node.setAnnotation(newAnnotation);
+            const step = { ...this.steps[nodeId], annotation: newAnnotation };
+            this.onUpdateStep(step);
         },
-        onSetData(nodeId, newData) {
-            const node = this.nodes[nodeId];
-            this.lastQueue.enqueue(getModule, newData).then((data) => {
-                node.setData(data);
-            });
+        onSetData(stepId, newData) {
+            this.lastQueue
+                .enqueue(() => getModule(newData, stepId, this.stateStore.setLoadingState))
+                .then((data) => {
+                    const step = {
+                        ...this.steps[stepId],
+                        content_id: data.content_id,
+                        inputs: data.inputs,
+                        outputs: data.outputs,
+                        config_form: data.config_form,
+                        tool_state: data.tool_state,
+                        errors: data.errors,
+                    };
+                    this.onUpdateStep(step);
+                });
         },
         onLabel(nodeId, newLabel) {
-            const node = this.nodes[nodeId];
-            node.setLabel(newLabel);
+            const step = { ...this.steps[nodeId], label: newLabel };
+            this.onUpdateStep(step);
         },
-        onScrollTo(nodeId) {
-            const node = this.nodes[nodeId];
-            this.canvasManager.scrollToNode(node);
-            node.onScrollTo();
+        onScrollTo(stepId) {
+            this.scrollToId = stepId;
+            this.onHighlight(stepId);
         },
-        onHighlight(nodeId) {
-            const node = this.nodes[nodeId];
-            node.onHighlight();
+        onHighlight(stepId) {
+            this.highlightId = stepId;
         },
-        onUnhighlight(nodeId) {
-            const node = this.nodes[nodeId];
-            node.onUnhighlight();
+        onUnhighlight(stepId) {
+            this.highlightId = null;
         },
         onLint() {
             this._ensureParametersSet();
-            this.onDeactivate();
+            this.stateStore.setActiveNode(null);
             this.showInPanel = "lint";
         },
         onUpgrade() {
@@ -646,13 +594,6 @@ export default {
                 this.$router.push(url);
             });
         },
-        onZoom(zoomLevel) {
-            this.zoomLevel = this.canvasManager.setZoom(zoomLevel);
-        },
-        resetWheel() {
-            this.zoomLevel = this.canvasManager.zoomLevel;
-            this.canvasManager.isWheeled = false;
-        },
         onSave(hideProgress = false) {
             !hideProgress && this.onWorkflowMessage("Saving workflow...", "progress");
             return saveWorkflow(this)
@@ -685,20 +626,43 @@ export default {
             }
         },
         _ensureParametersSet() {
-            this.parameters = getUntypedWorkflowParameters(this.nodes);
+            this.parameters = getUntypedWorkflowParameters(this.steps);
         },
         _insertStep(contentId, name, type) {
             if (!this.isCanvas) {
                 this.isCanvas = true;
                 return;
             }
-            Vue.set(this.steps, this.nodeIndex++, {
+            const stepData = {
                 name: name,
                 content_id: contentId,
                 type: type,
+                position: defaultPosition(this.graphOffset, this.transform),
+                post_job_actions: {},
+            };
+            const { id } = this.stepStore.addStep(stepData);
+            getModule(stepData, id, this.stateStore.setLoadingState).then((response) => {
+                this.stepStore.updateStep({
+                    ...stepData,
+                    tool_state: response.tool_state,
+                    inputs: response.inputs,
+                    outputs: response.outputs,
+                    config_form: response.config_form,
+                });
+                this.stateStore.setActiveNode(id);
             });
         },
         async _loadEditorData(data) {
+            if (data.name !== undefined) {
+                this.name = data.name;
+            }
+            if (data.annotation !== undefined) {
+                this.annotation = data.annotation;
+            }
+            if (data.version !== undefined) {
+                this.version = data.version;
+            }
+
             const report = data.report || {};
             const markdown = report.markdown || reportDefault;
             this.markdownText = markdown;
@@ -712,16 +676,15 @@ export default {
                 this.versions = versions;
             });
             await Vue.nextTick();
-            this.canvasManager.drawOverview();
-            this.canvasManager.scrollToNodes();
             this.hasChanges = has_changes;
         },
         _loadCurrent(id, version) {
+            this.resetStores();
             this.onWorkflowMessage("Loading workflow...", "progress");
             this.lastQueue
-                .enqueue(loadWorkflow, { id, version, workflow: this })
+                .enqueue(loadWorkflow, { id, version })
                 .then((data) => {
-                    console.debug("Editor - Loading workflow:", id);
+                    fromSimple(data);
                     this._loadEditorData(data);
                 })
                 .catch((response) => {
@@ -740,14 +703,8 @@ export default {
                 this.creator = creator;
             }
         },
-        getManager() {
-            return this;
-        },
-        getCanvasManager() {
-            return this.canvasManager;
-        },
-        getNode() {
-            return this.activeNode;
+        onActiveNode(nodeId) {
+            this.$refs["right-panel"].scrollTop = 0;
         },
         onInsertedStateMessages(insertedStateMessages) {
             this.insertedStateMessages = insertedStateMessages;
diff --git a/client/src/components/Workflow/Editor/Lint.test.js b/client/src/components/Workflow/Editor/Lint.test.js
index 6dd5b994967..dc0e13723a7 100644
--- a/client/src/components/Workflow/Editor/Lint.test.js
+++ b/client/src/components/Workflow/Editor/Lint.test.js
@@ -1,77 +1,104 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
-import Lint from "./Lint";
+import { getLocalVue } from "tests/jest/helpers";
+import Lint from "./Lint.vue";
 import { getUntypedWorkflowParameters } from "./modules/parameters";
-
-jest.mock("app");
+import { testDatatypesMapper } from "@/components/Datatypes/test_fixtures";
+import { useWorkflowStepStore } from "@/stores/workflowStepStore";
+import { PiniaVuePlugin } from "pinia";
+import { createTestingPinia } from "@pinia/testing";
 
 const localVue = getLocalVue();
+localVue.use(PiniaVuePlugin);
 
-const nodes = {
+const steps = {
+    0: {
+        id: 0,
+        type: "data_input",
+        label: "data input",
+        content_id: null,
+        name: "Input dataset",
+        errors: null,
+        inputs: [],
+        outputs: [
+            {
+                name: "output",
+                extensions: ["input"],
+                optional: false,
+            },
+        ],
+        annotation: "",
+    },
     1: {
-        id: "1",
-        title: "node_title",
-        label: "",
+        id: 1,
+        label: "step label",
         annotation: "",
         config_form: {
             inputs: [
                 {
-                    name: "name",
+                    name: "input",
                     type: "text",
                     value: "${untyped_parameter}",
                 },
             ],
         },
-        inputTerminals: {
-            input: {
-                attributes: {
-                    input: {
-                        label: "input_label",
-                    },
-                },
+        inputs: [
+            {
+                label: "input_label",
+                name: "data_input",
+                multiple: false,
+                extensions: ["txt"],
+                optional: false,
+                input_type: "dataset",
+            },
+        ],
+        input_connections: {
+            data_input: {
+                output_name: "output",
+                id: 0,
             },
         },
-        outputTerminals: {},
-        activeOutputs: {
-            getAll() {
-                return [
-                    {
-                        output_name: "output_1",
-                    },
-                ];
+        outputs: [
+            {
+                name: "output",
+                extensions: ["input"],
+                optional: false,
             },
-        },
+        ],
+        workflow_outputs: [
+            {
+                output_name: "output",
+            },
+        ],
     },
     2: {
-        id: "2",
+        id: 2,
         title: "",
         label: "",
         annotation: "",
-        inputTerminals: {},
-        activeOutputs: {
-            getAll() {
-                return [];
-            },
-        },
+        outpus: {},
+        inputs: [],
     },
 };
 
 describe("Lint", () => {
     let wrapper;
+    let stepStore;
 
     beforeEach(() => {
         wrapper = mount(Lint, {
             propsData: {
-                untypedParameters: getUntypedWorkflowParameters(nodes),
-                getManager: () => {
-                    return { nodes: nodes };
-                },
+                untypedParameters: getUntypedWorkflowParameters(steps),
+                steps: steps,
                 annotation: "annotation",
                 license: null,
                 creator: null,
+                datatypesMapper: testDatatypesMapper,
             },
             localVue,
+            pinia: createTestingPinia({ stubActions: false }),
         });
+        stepStore = useWorkflowStepStore();
+        Object.values(steps).map((step) => stepStore.addStep(step));
     });
 
     it("test checked vs unchecked issues", async () => {
@@ -87,7 +114,7 @@ describe("Lint", () => {
         // 2. Workflow license is not specified
         // 3. Workflow has no labeled outputs
         // 4. Untyped parameter found
-        // 5. Missing input connection
+        // 5. Missing an annotation
         // 6. Unlabeled output found
         expect(unchecked.length).toBe(5);
         const links = wrapper.findAll("a");
@@ -96,13 +123,22 @@ describe("Lint", () => {
         expect(links.at(1).text()).toContain("Provide Creator Details.");
         expect(links.at(2).text()).toContain("Specify a License.");
         expect(links.at(3).text()).toContain("untyped_parameter");
-        expect(links.at(4).text()).toContain("node_title: input_label");
-        expect(links.at(5).text()).toContain("output_1");
+        expect(links.at(4).text()).toContain("data input: Missing an annotation");
+        expect(links.at(5).text()).toContain("step label: output");
     });
 
-    it("should fire refactor event to extract untyped paramater and remove unlabeld workflows", async () => {
+    it("should fire refactor event to extract untyped parameter and remove unlabeled workflows", async () => {
+        wrapper.vm.onRefactor();
+        expect(wrapper.emitted().onRefactor.length).toBe(1);
+        const actions = wrapper.emitted().onRefactor[0][0];
+        expect(actions.length).toBe(2);
+        expect(actions[0].action_type).toBe("extract_untyped_parameter");
+        expect(actions[0].name).toBe("untyped_parameter");
+        expect(actions[1].action_type).toBe("remove_unlabeled_workflow_outputs");
+    });
+    it("should include connect input action when input disconnected", async () => {
+        stepStore.removeStep(0);
         wrapper.vm.onRefactor();
-        await wrapper.vm.$nextTick();
         expect(wrapper.emitted().onRefactor.length).toBe(1);
         const actions = wrapper.emitted().onRefactor[0][0];
         expect(actions.length).toBe(3);
diff --git a/client/src/components/Workflow/Editor/Lint.vue b/client/src/components/Workflow/Editor/Lint.vue
index f4920f86bd0..1a0a49ca3e7 100644
--- a/client/src/components/Workflow/Editor/Lint.vue
+++ b/client/src/components/Workflow/Editor/Lint.vue
@@ -92,6 +92,9 @@ import {
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { faMagic, faExclamationTriangle } from "@fortawesome/free-solid-svg-icons";
+import { useWorkflowStepStore } from "@/stores/workflowStepStore";
+import { DatatypesMapperModel } from "@/components/Datatypes/model";
+import { storeToRefs } from "pinia";
 
 Vue.use(BootstrapVue);
 
@@ -106,9 +109,10 @@ export default {
     props: {
         untypedParameters: {
             type: UntypedParameters,
+            required: true,
         },
-        getManager: {
-            type: Function,
+        steps: {
+            type: Object,
             required: true,
         },
         annotation: {
@@ -120,27 +124,19 @@ export default {
             default: null,
         },
         creator: {
+            type: Array,
             default: null,
         },
+        datatypesMapper: {
+            type: DatatypesMapperModel,
+            required: true,
+        },
     },
-    data() {
-        return {
-            forceRefresh: 0,
-        };
+    setup() {
+        const { hasActiveOutputs } = storeToRefs(useWorkflowStepStore());
+        return { hasActiveOutputs };
     },
     computed: {
-        nodes() {
-            return this.getManager().nodes;
-        },
-        hasActiveOutputs() {
-            this.forceRefresh;
-            for (const node of Object.values(this.nodes)) {
-                if (node.activeOutputs.getAll().length > 0) {
-                    return true;
-                }
-            }
-            return false;
-        },
         showRefactor() {
             // we could be even more precise here and check the inputs and such, because
             // some of these extractions may not be possible.
@@ -172,25 +168,16 @@ export default {
             return getUntypedParameters(this.untypedParameters);
         },
         warningDisconnectedInputs() {
-            this.forceRefresh;
-            return getDisconnectedInputs(this.nodes);
+            return getDisconnectedInputs(this.steps, this.datatypesMapper);
         },
         warningMissingMetadata() {
-            this.forceRefresh;
-            return getMissingMetadata(this.nodes);
+            return getMissingMetadata(this.steps);
         },
         warningUnlabeledOutputs() {
-            this.forceRefresh;
-            return getUnlabeledOutputs(this.nodes);
+            return getUnlabeledOutputs(this.steps);
         },
     },
     methods: {
-        refresh() {
-            // I tried to make these purely reactive but I guess it is not surprising that the
-            // entirity of the nodes object and children aren't all purely reactive.
-            // https://logaretm.com/blog/2019-10-11-forcing-recomputation-of-computed-properties/
-            this.forceRefresh += 1;
-        },
         onAttributes() {
             this.$emit("onAttributes");
         },
@@ -237,7 +224,7 @@ export default {
             this.$emit("onUnhighlight", item.stepId);
         },
         onRefactor() {
-            const actions = fixAllIssues(this.nodes, this.untypedParameters);
+            const actions = fixAllIssues(this.steps, this.untypedParameters);
             this.$emit("onRefactor", actions);
         },
     },
diff --git a/client/src/components/Workflow/Editor/LintSection.vue b/client/src/components/Workflow/Editor/LintSection.vue
index 7ff7e19aa47..cc400b4d599 100644
--- a/client/src/components/Workflow/Editor/LintSection.vue
+++ b/client/src/components/Workflow/Editor/LintSection.vue
@@ -12,7 +12,9 @@
                     v-for="(item, idx) in warningItems"
                     :key="idx"
                     class="ml-2"
+                    @focusin="onMouseOver(item)"
                     @mouseover="onMouseOver(item)"
+                    @focusout="onMouseLeave(item)"
                     @mouseleave="onMouseLeave(item)">
                     <a href="#" class="scrolls" @click="onClick(item)">
                         <font-awesome-icon v-if="item.autofix" icon="magic" class="mr-1" />
diff --git a/client/src/components/Workflow/Editor/MessagesModal.vue b/client/src/components/Workflow/Editor/MessagesModal.vue
index 34dd854ceb0..9c67d7eb746 100644
--- a/client/src/components/Workflow/Editor/MessagesModal.vue
+++ b/client/src/components/Workflow/Editor/MessagesModal.vue
@@ -29,14 +29,17 @@ export default {
         title: {
             type: String,
             required: false,
+            default: undefined,
         },
         message: {
             type: String,
             required: false,
+            default: undefined,
         },
         error: {
             type: Boolean,
             required: false,
+            default: undefined,
         },
     },
     data() {
diff --git a/client/src/components/Workflow/Editor/MinimapNode.vue b/client/src/components/Workflow/Editor/MinimapNode.vue
new file mode 100644
index 00000000000..6fec83da375
--- /dev/null
+++ b/client/src/components/Workflow/Editor/MinimapNode.vue
@@ -0,0 +1,27 @@
+<script lang="ts" setup>
+import { useWorkflowStateStore } from "@/stores/workflowEditorStateStore";
+import type { Step } from "@/stores/workflowStepStore";
+import { computed } from "vue";
+
+const props = defineProps<{
+    step: Step;
+}>();
+
+const stateStore = useWorkflowStateStore();
+const nodePosition = computed(() => stateStore.stepPosition[props.step.id]);
+
+const nodeClass = computed(() => {
+    const stateClass = props.step.errors ? "error" : "ok";
+
+    const highlightClass = stateStore.activeNodeId == props.step.id ? "highlight" : "";
+    return [stateClass, highlightClass];
+});
+</script>
+<template>
+    <rect
+        :class="nodeClass"
+        :x="step.position.left"
+        :y="step.position.top"
+        :width="nodePosition.width"
+        :height="nodePosition.height" />
+</template>
diff --git a/client/src/components/Workflow/Editor/Node.test.js b/client/src/components/Workflow/Editor/Node.test.js
deleted file mode 100644
index 9b8cc98ec01..00000000000
--- a/client/src/components/Workflow/Editor/Node.test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
-import Node from "./Node";
-import flushPromises from "flush-promises";
-
-jest.mock("app");
-
-const localVue = getLocalVue();
-
-describe("Node", () => {
-    it("test attributes", async () => {
-        const wrapper = shallowMount(Node, {
-            propsData: {
-                id: "node-id",
-                name: "node-name",
-                type: "tool",
-                step: {},
-                getManager: () => {},
-                getCanvasManager: () => {},
-                datatypesMapper: {},
-            },
-            localVue,
-        });
-        await flushPromises();
-        const icon = wrapper.findAll("i");
-        expect(icon.at(2).classes()).toEqual(expect.arrayContaining(["fa-wrench"]));
-        const toolLinks = wrapper.findAll("i");
-        expect(toolLinks.length).toBe(3);
-        await wrapper.setProps({ type: "subworkflow" });
-        expect(icon.at(2).classes()).toEqual(expect.arrayContaining(["fa-sitemap"]));
-        const subworkflowLinks = wrapper.findAll("i");
-        expect(subworkflowLinks.length).toBe(2);
-        const workflowTitle = wrapper.find(".node-title");
-        expect(workflowTitle.text()).toBe("node-name");
-    });
-});
diff --git a/client/src/components/Workflow/Editor/Node.test.ts b/client/src/components/Workflow/Editor/Node.test.ts
new file mode 100644
index 00000000000..2f2f98233e9
--- /dev/null
+++ b/client/src/components/Workflow/Editor/Node.test.ts
@@ -0,0 +1,47 @@
+import { shallowMount } from "@vue/test-utils";
+import { getLocalVue } from "tests/jest/helpers";
+import Node from "./Node.vue";
+import flushPromises from "flush-promises";
+import { setActivePinia } from "pinia";
+import { createTestingPinia } from "@pinia/testing";
+import { testDatatypesMapper } from "@/components/Datatypes/test_fixtures";
+import { mockOffset } from "./test_fixtures";
+
+jest.mock("app");
+
+const localVue = getLocalVue();
+
+describe("Node", () => {
+    it("test attributes", async () => {
+        const testingPinia = createTestingPinia();
+        setActivePinia(testingPinia);
+        const wrapper = shallowMount(Node, {
+            propsData: {
+                id: 0,
+                contentId: "tool name",
+                activeNodeId: 0,
+                name: "node-name",
+                step: { type: "tool", inputs: [], outputs: [], position: { top: 0, left: 0 } },
+                datatypesMapper: testDatatypesMapper,
+                rootOffset: mockOffset,
+            },
+            localVue,
+            pinia: testingPinia,
+        });
+        await flushPromises();
+        // fa-wrench is the tool icon ...
+        expect(wrapper.findAll(".fa-wrench")).toHaveLength(1);
+        const toolLinks = wrapper.findAll("i");
+        expect(toolLinks.length).toBe(3);
+        await wrapper.setProps({
+            step: { label: "step label", type: "subworkflow", inputs: [], outputs: [], position: { top: 0, left: 0 } },
+        });
+        // fa-sitemap is the subworkflow icon ...
+        expect(wrapper.findAll(".fa-sitemap")).toHaveLength(1);
+        expect(wrapper.findAll(".fa-wrench")).toHaveLength(0);
+        const subworkflowLinks = wrapper.findAll("i");
+        expect(subworkflowLinks.length).toBe(2);
+        const workflowTitle = wrapper.find(".node-title");
+        expect(workflowTitle.text()).toBe("step label");
+    });
+});
diff --git a/client/src/components/Workflow/Editor/Node.vue b/client/src/components/Workflow/Editor/Node.vue
index c3bf6d13c59..377791425c0 100644
--- a/client/src/components/Workflow/Editor/Node.vue
+++ b/client/src/components/Workflow/Editor/Node.vue
@@ -1,369 +1,221 @@
 <template>
-    <div
+    <draggable-wrapper
         :id="idString"
+        ref="el"
+        :scale="scale"
+        :root-offset="rootOffset"
         :name="name"
-        :node-label="label"
-        :class="{ 'workflow-node': true, 'node-on-scroll-to': scrolledTo, 'node-highlight': highlight }">
-        <div class="node-header unselectable clearfix">
-            <b-button
-                v-b-tooltip.hover
-                class="node-destroy py-0 float-right"
-                variant="primary"
-                size="sm"
-                aria-label="destroy node"
-                title="Remove"
-                @click="onRemove">
-                <i class="fa fa-times" />
-            </b-button>
-            <b-button
-                v-if="isEnabled"
-                :id="popoverId"
-                class="node-recommendations py-0 float-right"
-                variant="primary"
-                size="sm"
-                aria-label="tool recommendations">
-                <i class="fa fa-arrow-right" />
-            </b-button>
-            <b-popover :target="popoverId" triggers="hover" placement="bottom" :show.sync="popoverShow">
-                <Recommendations
-                    :get-node="getNode"
-                    :get-manager="getManager"
-                    :datatypes-mapper="datatypesMapper"
-                    @onCreate="onCreate" />
-            </b-popover>
-            <b-button
-                v-if="canClone"
-                v-b-tooltip.hover
-                class="node-clone py-0 float-right"
-                variant="primary"
-                size="sm"
-                aria-label="clone node"
-                title="Duplicate"
-                @click="onClone">
-                <i class="fa fa-files-o" />
-            </b-button>
+        :node-label="title"
+        :class="classes"
+        :style="style"
+        @move="onMoveTo"
+        @pan-by="onPanBy">
+        <div class="node-header unselectable clearfix" @click="makeActive" @keyup.enter="makeActive">
+            <loading-span v-if="isLoading" message="Loading details" />
+            <b-button-group class="float-right">
+                <b-button
+                    v-if="canClone"
+                    v-b-tooltip.hover
+                    class="node-clone py-0"
+                    variant="primary"
+                    size="sm"
+                    aria-label="clone node"
+                    title="Duplicate"
+                    @click.prevent.stop="onClone">
+                    <i class="fa fa-files-o" />
+                </b-button>
+                <b-button
+                    v-b-tooltip.hover
+                    class="node-destroy py-0"
+                    variant="primary"
+                    size="sm"
+                    aria-label="destroy node"
+                    title="Remove"
+                    @click.prevent.stop="remove">
+                    <i class="fa fa-times" />
+                </b-button>
+                <b-button
+                    v-if="isEnabled"
+                    :id="popoverId"
+                    class="node-recommendations py-0"
+                    variant="primary"
+                    size="sm"
+                    aria-label="tool recommendations">
+                    <i class="fa fa-arrow-right" />
+                </b-button>
+                <b-popover
+                    v-if="isEnabled"
+                    :target="popoverId"
+                    triggers="hover"
+                    placement="bottom"
+                    :show.sync="popoverShow">
+                    <Recommendations
+                        v-if="popoverShow"
+                        :step-id="id"
+                        :datatypes-mapper="datatypesMapper"
+                        @onCreate="onCreate" />
+                </b-popover>
+            </b-button-group>
             <i :class="iconClass" />
             <span
                 v-b-tooltip.hover
                 title="Index of the step in the workflow run form. Steps are ordered by distance to the upper-left corner of the window; inputs are listed first."
-                >{{ stepIndex }}:
+                >{{ step.id + 1 }}:
             </span>
             <span class="node-title">{{ title }}</span>
         </div>
-        <b-alert v-if="!!errors" variant="danger" show class="node-error">
+        <b-alert v-if="!!errors" variant="danger" show class="node-error" @click="makeActive">
             {{ errors }}
         </b-alert>
-        <div v-else class="node-body">
-            <loading-span v-if="showLoading" message="Loading details" />
+        <div v-else class="node-body" @click="makeActive" @keyup.enter="makeActive">
             <node-input
                 v-for="input in inputs"
                 :key="input.name"
                 :input="input"
-                :get-node="getNode"
-                :get-manager="getManager"
+                :step-id="id"
                 :datatypes-mapper="datatypesMapper"
-                @onAdd="onAddInput"
-                @onRemove="onRemoveInput"
+                :step-position="step.position"
+                :root-offset="rootOffset"
+                :scroll="scroll"
+                :scale="scale"
+                v-on="$listeners"
                 @onChange="onChange" />
             <div v-if="showRule" class="rule" />
             <node-output
                 v-for="output in outputs"
                 :key="output.name"
                 :output="output"
+                :workflow-outputs="workflowOutputs"
                 :post-job-actions="postJobActions"
-                :get-node="getNode"
-                :get-manager="getManager"
-                @onAdd="onAddOutput"
-                @onRemove="onRemoveOutput"
-                @onToggle="onToggleOutput"
+                :step-id="id"
+                :step-type="step.type"
+                :step-position="step.position"
+                :root-offset="rootOffset"
+                :scroll="scroll"
+                :scale="scale"
+                :datatypes-mapper="datatypesMapper"
+                v-on="$listeners"
+                @stopDragging="onStopDragging"
                 @onChange="onChange" />
         </div>
-    </div>
+    </draggable-wrapper>
 </template>
 
-<script>
+<script lang="ts" setup>
+import type { PropType, Ref } from "vue";
 import Vue from "vue";
 import BootstrapVue from "bootstrap-vue";
-import WorkflowIcons from "components/Workflow/icons";
-import LoadingSpan from "components/LoadingSpan";
-import { getGalaxyInstance } from "app";
-import Recommendations from "components/Workflow/Editor/Recommendations";
-import NodeInput from "./NodeInput";
-import NodeOutput from "./NodeOutput";
-import { ActiveOutputs } from "./modules/outputs";
-import { attachDragging } from "./modules/dragging";
+import WorkflowIcons from "@/components/Workflow/icons";
+import LoadingSpan from "@/components/LoadingSpan.vue";
+import { getGalaxyInstance } from "@/app";
+import Recommendations from "@/components/Workflow/Editor/Recommendations.vue";
+import NodeInput from "@/components/Workflow/Editor/NodeInput.vue";
+import NodeOutput from "@/components/Workflow/Editor/NodeOutput.vue";
+import DraggableWrapper from "@/components/Workflow/Editor/DraggablePan.vue";
+import { computed, ref } from "vue";
+import { useNodePosition } from "@/components/Workflow/Editor/composables/useNodePosition";
+import { useWorkflowStateStore, type XYPosition } from "@/stores/workflowEditorStateStore";
+import type { Step } from "@/stores/workflowStepStore";
+import { DatatypesMapperModel } from "@/components/Datatypes/model";
+import type { UseElementBoundingReturn, UseScrollReturn } from "@vueuse/core";
+
 Vue.use(BootstrapVue);
 
-const OFFSET_RANGE = 100;
+const props = defineProps({
+    id: { type: Number, required: true },
+    contentId: { type: String as PropType<string | null>, default: null },
+    name: { type: String as PropType<string | null>, default: null },
+    step: { type: Object as PropType<Step>, required: true },
+    datatypesMapper: { type: DatatypesMapperModel, required: true },
+    activeNodeId: {
+        type: null as unknown as PropType<number | null>,
+        required: true,
+        validator: (v: any) => typeof v === "number" || v === null,
+    },
+    rootOffset: { type: Object as PropType<UseElementBoundingReturn>, required: true },
+    scroll: { type: Object as PropType<UseScrollReturn>, required: true },
+    scale: { type: Number, default: 1 },
+    highlight: { type: Boolean, default: false },
+});
 
-export default {
-    components: {
-        LoadingSpan,
-        Recommendations,
-        NodeInput,
-        NodeOutput,
-    },
-    props: {
-        id: {
-            type: String,
-            default: "",
-        },
-        contentId: {
-            type: String,
-            default: "",
-        },
-        name: {
-            type: String,
-            default: "name",
-        },
-        type: {
-            type: String,
-            default: null,
-        },
-        step: {
-            type: Object,
-            default: null,
-        },
-        getManager: {
-            type: Function,
-            default: null,
-        },
-        getCanvasManager: {
-            type: Function,
-            default: null,
-        },
-        datatypesMapper: {
-            type: Object,
-            default: null,
-        },
-    },
-    data() {
-        return {
-            popoverShow: false,
-            inputs: [],
-            outputs: [],
-            inputTerminals: {},
-            outputTerminals: {},
-            postJobActions: {},
-            activeOutputs: null,
-            errors: null,
-            label: null,
-            annotation: null,
-            config_form: {},
-            showLoading: true,
-            highlight: false,
-            scrolledTo: false,
-        };
-    },
-    computed: {
-        title() {
-            return this.label || this.name;
-        },
-        idString() {
-            return `wf-node-step-${this.id}`;
-        },
-        showRule() {
-            return this.inputs.length > 0 && this.outputs.length > 0;
-        },
-        iconClass() {
-            const iconType = WorkflowIcons[this.type];
-            if (iconType) {
-                return `icon fa fa-fw ${iconType}`;
-            }
-            return null;
-        },
-        popoverId() {
-            return `popover-${this.id}`;
-        },
-        canClone() {
-            return this.type != "subworkflow";
-        },
-        isEnabled() {
-            return getGalaxyInstance().config.enable_tool_recommendations;
-        },
-        isInput() {
-            return this.type == "data_input" || this.type == "data_collection_input" || this.type == "parameter_input";
-        },
-        stepIndex() {
-            return parseInt(this.id) + 1;
-        },
-    },
-    mounted() {
-        this.canvasManager = this.getCanvasManager();
-        this.activeOutputs = new ActiveOutputs();
-        this.element = this.$el;
-        this.content_id = this.contentId;
+const emit = defineEmits([
+    "onRemove",
+    "onActivate",
+    "onChange",
+    "onCreate",
+    "onUpdate",
+    "onClone",
+    "onUpdateStepPosition",
+    "pan-by",
+    "stopDragging",
+]);
 
-        // Set initial scroll position
-        const step = this.step;
-        const el = this.$el;
-        if (step.position) {
-            el.style.top = step.position.top + "px";
-            el.style.left = step.position.left + "px";
-        } else {
-            const p = document.getElementById("canvas-viewport");
-            const o = document.getElementById("canvas-container");
-            if (p && o) {
-                const left =
-                    -o.offsetLeft + (p.offsetWidth - el.offsetWidth) / 2 + this.offsetVaryPosition(OFFSET_RANGE);
-                const top =
-                    -o.offsetTop + (p.offsetHeight - el.offsetHeight) / 2 + this.offsetVaryPosition(OFFSET_RANGE);
-                el.style.top = `${top}px`;
-                el.style.left = `${left}px`;
-            }
-        }
+const popoverShow = ref(false);
+const popoverId = computed(() => `popover-${props.id}`);
+const scrolledTo = ref(false);
 
-        // Attach node dragging events
-        attachDragging(this.$el, {
-            dragstart: () => {
-                this.$emit("onActivate", this);
-            },
-            dragend: () => {
-                this.$emit("onChange");
-                this.canvasManager.drawOverview();
-            },
-            drag: (e, d) => {
-                const o = document.getElementById("canvas-container");
-                const el = this.$el;
-                const rect = o.getBoundingClientRect();
-                const left = (d.offsetX - rect.left) / this.canvasManager.canvasZoom;
-                const top = (d.offsetY - rect.top) / this.canvasManager.canvasZoom;
-                el.style.left = `${left}px`;
-                el.style.top = `${top}px`;
-                this.onRedraw();
-            },
-            dragclickonly: () => {
-                this.$emit("onActivate", this);
-            },
-        });
+function remove() {
+    emit("onRemove", props.id);
+}
 
-        // initialize node data
-        this.$emit("onAdd", this);
-        if (this.step.config_form) {
-            this.initData(this.step);
-        } else {
-            this.$emit("onUpdate", this);
-        }
-    },
+const el: Ref<HTMLElement | null> = ref(null);
+const postJobActions = computed(() => props.step.post_job_actions || {});
+const workflowOutputs = computed(() => props.step.workflow_outputs || []);
+const stateStore = useWorkflowStateStore();
+const isLoading = computed(() => Boolean(stateStore.getStepLoadingState(props.id)?.loading));
+useNodePosition(el, props.id, stateStore);
+const title = computed(() => props.step.label || props.step.name);
+const idString = computed(() => `wf-node-step-${props.id}`);
+const showRule = computed(() => props.step.inputs?.length > 0 && props.step.outputs?.length > 0);
+const iconClass = computed(() => `icon fa fa-fw ${WorkflowIcons[props.step.type]}`);
+const canClone = computed(() => props.step.type !== "subworkflow"); // Why ?
+const isEnabled = getGalaxyInstance().config.enable_tool_recommendations; // getGalaxyInstance is not reactive
 
-    methods: {
-        onChange() {
-            this.onRedraw();
-            this.$emit("onChange");
-        },
-        onAddInput(input, terminal) {
-            this.inputTerminals[input.name] = terminal;
-            this.onRedraw();
-        },
-        onRemoveInput(input) {
-            delete this.inputTerminals[input.name];
-            this.onRedraw();
-        },
-        onAddOutput(output, terminal) {
-            this.outputTerminals[output.name] = terminal;
-            this.onRedraw();
-        },
-        onRemoveOutput(output) {
-            delete this.outputTerminals[output.name];
-            this.onRedraw();
-        },
-        onToggleOutput(name) {
-            this.activeOutputs.toggle(name);
-            this.$emit("onChange");
-        },
-        onCreate(contentId, name) {
-            this.$emit("onCreate", contentId, name);
-            this.popoverShow = false;
-        },
-        onClone() {
-            this.$emit("onClone", this);
-        },
-        onRemove() {
-            Object.values(this.inputTerminals).forEach((t) => {
-                t.destroy();
-            });
-            Object.values(this.outputTerminals).forEach((t) => {
-                t.destroy();
-            });
-            this.activeOutputs.filterOutputs([]);
-            this.$emit("onRemove", this);
-        },
-        onRedraw() {
-            Object.values(this.inputTerminals).forEach((t) => {
-                t.redraw();
-            });
-            Object.values(this.outputTerminals).forEach((t) => {
-                t.redraw();
-            });
-        },
-        getNode() {
-            return this;
-        },
-        setNode(data) {
-            this.initData(data);
-            this.$emit("onChange");
-            this.$emit("onActivate", this);
-        },
-        setAnnotation(annotation) {
-            this.annotation = annotation;
-            this.$emit("onChange");
-        },
-        setLabel(label) {
-            this.label = label;
-            this.$emit("onChange");
-        },
-        setData(data) {
-            this.content_id = data.content_id;
-            this.tool_state = data.tool_state;
-            this.errors = data.errors;
-            this.tooltip = data.tooltip || "";
-            this.inputs = data.inputs ? data.inputs.slice() : [];
-            this.outputs = data.outputs ? data.outputs.slice() : [];
-            const outputNames = this.outputs.map((output) => output.name);
-            this.activeOutputs.initialize(this.outputs, data.workflow_outputs);
-            this.activeOutputs.filterOutputs(outputNames);
-            // data coming from the workflow editor API has post job actions,
-            // data coming from the build_module call does not (and should not)
-            this.postJobActions = data.post_job_actions || this.postJobActions;
-            this.config_form = data.config_form;
-        },
-        initData(data) {
-            this.uuid = data.uuid;
-            this.annotation = data.annotation;
-            this.label = data.label;
-            this.setData(data);
-            this.showLoading = false;
-        },
-        onScrollTo() {
-            this.scrolledTo = true;
-            setTimeout(() => {
-                this.scrolledTo = false;
-            }, 2000);
-        },
-        onHighlight() {
-            this.highlight = true;
-        },
-        onUnhighlight() {
-            this.highlight = false;
-        },
-        makeActive() {
-            this.element.classList.add("node-active");
-        },
-        makeInactive() {
-            // Keep inactive nodes stacked from most to least recently active
-            // by moving element to the end of parent's node list
-            document.activeElement.blur();
-            const element = this.element;
-            ((p) => {
-                p.removeChild(element);
-                p.appendChild(element);
-            })(element.parentNode);
-            // Remove active class
-            element.classList.remove("node-active");
-        },
-        offsetVaryPosition(offsetRange) {
-            return Math.floor(Math.random() * offsetRange);
-        },
-    },
-};
+const isActive = computed(() => props.id === props.activeNodeId);
+const classes = computed(() => {
+    return {
+        "workflow-node": true,
+        "node-on-scroll-to": scrolledTo.value,
+        "node-highlight": props.highlight || isActive.value,
+        "is-active": isActive.value,
+    };
+});
+const style = computed(() => {
+    return { top: props.step.position!.top + "px", left: props.step.position!.left + "px" };
+});
+const errors = computed(() => props.step.errors || stateStore.getStepLoadingState(props.id)?.error);
+const inputs = computed(() => props.step.inputs);
+const outputs = computed(() => props.step.outputs);
+
+function onMoveTo(position: XYPosition) {
+    emit("onUpdateStepPosition", props.id, {
+        top: position.y + props.scroll.y.value / props.scale,
+        left: position.x + props.scroll.x.value / props.scale,
+    });
+}
+
+function onPanBy(panBy: XYPosition) {
+    emit("pan-by", panBy);
+}
+
+function onStopDragging() {
+    emit("stopDragging");
+}
+
+function onChange() {
+    emit("onChange");
+}
+
+function onCreate(contentId: string, name: string) {
+    emit("onCreate", contentId, name);
+    popoverShow.value = false;
+}
+
+function onClone() {
+    emit("onClone", props.id);
+}
+
+function makeActive() {
+    emit("onActivate", props.id);
+}
 </script>
diff --git a/client/src/components/Workflow/Editor/NodeInput.vue b/client/src/components/Workflow/Editor/NodeInput.vue
index 12950a113f7..28b9e76faa5 100644
--- a/client/src/components/Workflow/Editor/NodeInput.vue
+++ b/client/src/components/Workflow/Editor/NodeInput.vue
@@ -1,127 +1,186 @@
 <template>
-    <div class="form-row dataRow input-data-row" @mouseover="mouseOver" @mouseleave="mouseLeave">
-        <div :id="id" ref="terminal" :input-name="input.name" :class="terminalClass">
-            <div class="icon" />
+    <div
+        class="form-row dataRow input-data-row"
+        @mouseleave="leave"
+        @mouseenter="enter"
+        @focusin="enter"
+        @focusout="leave">
+        <div
+            :id="id"
+            :input-name="input.name"
+            :class="terminalClass"
+            @drop.prevent="onDrop"
+            @dragenter.prevent="dragEnter"
+            @dragleave.prevent="dragLeave">
+            <div :id="iconId" ref="el" v-b-tooltip.manual class="icon" :title="reason" />
         </div>
-        <div v-if="showRemove" class="delete-terminal" @click="onRemove" />
+        <div v-if="showRemove" class="delete-terminal" @click="onRemove" @keyup.delete="onRemove" />
         {{ label }}
     </div>
 </template>
 
 <script>
-import Terminals from "./modules/terminals";
-import { InputDragging } from "./modules/dragging";
-import Connector from "./modules/connector";
+import { useCoordinatePosition } from "./composables/useCoordinatePosition";
+import { useConnectionStore } from "@/stores/workflowConnectionStore";
+import { computed } from "vue";
+import { inject, ref, toRefs, watchEffect } from "vue";
+import { UseElementBoundingReturn } from "@vueuse/core";
+import { storeToRefs } from "pinia";
+import { useTerminal } from "./composables/useTerminal";
+import { DatatypesMapperModel } from "@/components/Datatypes/model";
+import { useWorkflowStateStore } from "@/stores/workflowEditorStateStore";
+import { terminalFactory } from "@/components/Workflow/Editor/modules/terminals";
+
 export default {
     props: {
         input: {
             type: Object,
             required: true,
         },
-        getNode: {
-            type: Function,
-            required: true,
-        },
-        getManager: {
-            type: Function,
+        stepId: {
+            type: Number,
             required: true,
         },
         datatypesMapper: {
+            type: DatatypesMapperModel,
+            required: true,
+        },
+        stepPosition: {
+            type: Object,
+            required: true,
+        },
+        rootOffset: {
+            type: UseElementBoundingReturn,
+            required: true,
+        },
+        scale: {
+            type: Number,
+            required: true,
+        },
+        scroll: {
             type: Object,
             required: true,
         },
     },
+    setup(props) {
+        const el = ref(null);
+        const { rootOffset, stepPosition, stepId, input, datatypesMapper } = toRefs(props);
+        const position = useCoordinatePosition(el, rootOffset, stepPosition);
+        const isDragging = inject("isDragging");
+        const id = computed(() => `node-${props.stepId}-input-${props.input.name}`);
+        const iconId = computed(() => `${id.value}-icon`);
+        const connectionStore = useConnectionStore();
+        const { terminal, isMappedOver: isMultiple } = useTerminal(stepId, input, datatypesMapper);
+        const hasTerminals = ref(false);
+        watchEffect(() => {
+            hasTerminals.value = connectionStore.getOutputTerminalsForInputTerminal(id.value).length > 0;
+        });
+        const stateStore = useWorkflowStateStore();
+        const { draggingTerminal } = storeToRefs(stateStore);
+        return {
+            el,
+            position,
+            isDragging,
+            draggingTerminal,
+            connectionStore,
+            id,
+            iconId,
+            hasTerminals,
+            terminal,
+            stateStore,
+            isMultiple,
+        };
+    },
     data() {
         return {
             showRemove: false,
-            isMultiple: false,
         };
     },
     computed: {
-        id() {
-            const node = this.getNode();
-            return `node-${node.id}-input-${this.input.name}`;
+        terminalArgs() {
+            return { stepId: this.stepId, name: this.input.name, connectorType: "input" };
+        },
+        terminalPosition() {
+            return Object.freeze({ endX: this.startX, endY: this.startY });
+        },
+        startX() {
+            return this.position.left + this.scroll.x.value / this.scale + this.position.width / 2;
+        },
+        startY() {
+            return this.position.top + this.scroll.y.value / this.scale + this.position.height / 2;
         },
         label() {
             return this.input.label || this.input.name;
         },
-        terminalClass() {
-            const cls = "terminal input-terminal";
-            if (this.isMultiple) {
-                return `${cls} multiple`;
+        canAccept() {
+            if (this.draggingTerminal) {
+                return this.terminal.canAccept(this.draggingTerminal);
             }
-            return cls;
+            return null;
+        },
+        reason() {
+            const reason = this.canAccept?.reason;
+            return reason;
+        },
+        terminalClass() {
+            const classes = ["terminal", "input-terminal", "prevent-zoom"];
+            if (this.isDragging) {
+                classes.push("input-terminal-active");
+                if (this.canAccept?.canAccept) {
+                    classes.push("can-accept");
+                } else {
+                    classes.push("cannot-accept");
+                }
+            }
+            if (this.isMultiple) {
+                classes.push("multiple");
+            }
+            return classes;
         },
     },
     watch: {
-        input: function (newInput) {
-            const oldTerminal = this.terminal;
-            if (oldTerminal instanceof this.terminalClassForInput(newInput)) {
-                oldTerminal.update(newInput);
-                oldTerminal.destroyInvalidConnections();
-            } else {
-                // create new terminal, connect like old terminal, destroy old terminal
-                // this might be a little buggy, the terminals and connectors should be vue components
-                this.$emit("onRemove", this.input);
-                const newTerminal = this.createTerminal(newInput);
-                newTerminal.connectors = this.terminal.connectors.map((c) => {
-                    return new Connector(this.getManager().canvasManager, c.outputHandle, newTerminal);
-                });
-                newTerminal.destroyInvalidConnections();
-                this.terminal = newTerminal;
-                oldTerminal.destroy();
-            }
+        terminalPosition(position) {
+            this.stateStore.setInputTerminalPosition(this.stepId, this.input.name, position);
         },
     },
-    mounted() {
-        this.terminal = this.createTerminal(this.input);
-    },
     beforeDestroy() {
-        this.$emit("onRemove", this.input);
-        this.onRemove();
+        this.stateStore.deleteInputTerminalPosition({
+            stepId: this.stepId,
+            inputName: this.input.name,
+        });
     },
     methods: {
-        terminalClassForInput(input) {
-            let terminalClass = Terminals.InputTerminal;
-            if (input.input_type == "dataset_collection") {
-                terminalClass = Terminals.InputCollectionTerminal;
-            } else if (input.input_type == "parameter") {
-                terminalClass = Terminals.InputParameterTerminal;
+        dragEnter(event) {
+            if (this.reason) {
+                this.$root.$emit("bv::show::tooltip", this.iconId);
             }
-            return terminalClass;
+            event.preventDefault();
         },
-        createTerminal(input) {
-            const terminalClass = this.terminalClassForInput(input);
-            const terminal = new terminalClass({
-                node: this.getNode(),
-                datatypesMapper: this.datatypesMapper,
-                name: input.name,
-                input: input,
-                element: this.$refs.terminal,
-            });
-            terminal.on("change", this.onChange.bind(this));
-            new InputDragging(this.getManager(), {
-                el: this.$refs.terminal,
-                terminal: terminal,
-            });
-            this.$emit("onAdd", this.input, terminal);
-            return terminal;
+        dragLeave(event) {
+            this.$root.$emit("bv::hide::tooltip", this.iconId);
         },
         onChange() {
-            this.isMultiple = this.terminal.isMappedOver();
             this.$emit("onChange");
         },
         onRemove() {
-            this.terminal.destroy();
-        },
-        mouseOver(e) {
-            if (this.terminal.connectors.length > 0) {
-                this.showRemove = true;
-            }
-        },
-        mouseLeave() {
+            const connections = this.connectionStore.getConnectionsForTerminal(this.id);
+            connections.forEach((connection) => this.terminal.disconnect(connection));
             this.showRemove = false;
         },
+        enter() {
+            this.showRemove = this.hasTerminals;
+        },
+        leave() {
+            this.showRemove = false;
+        },
+        onDrop(e) {
+            const stepOut = JSON.parse(e.dataTransfer.getData("text/plain"));
+            const droppedTerminal = terminalFactory(stepOut.stepId, stepOut.output, this.datatypesMapper);
+            this.$root.$emit("bv::hide::tooltip", this.iconId);
+            if (this.terminal.canAccept(droppedTerminal).canAccept) {
+                this.terminal.connect(droppedTerminal);
+            }
+        },
     },
 };
 </script>
diff --git a/client/src/components/Workflow/Editor/NodeOutput.test.ts b/client/src/components/Workflow/Editor/NodeOutput.test.ts
new file mode 100644
index 00000000000..d675e7b00e4
--- /dev/null
+++ b/client/src/components/Workflow/Editor/NodeOutput.test.ts
@@ -0,0 +1,81 @@
+import { shallowMount } from "@vue/test-utils";
+import { getLocalVue } from "tests/jest/helpers";
+import NodeOutput from "./NodeOutput.vue";
+import { createPinia, setActivePinia } from "pinia";
+import { useWorkflowStepStore, type Step, type Steps } from "@/stores/workflowStepStore";
+import { testDatatypesMapper } from "@/components/Datatypes/test_fixtures";
+import { mockOffset, advancedSteps } from "./test_fixtures";
+import { nextTick, ref } from "vue";
+import { terminalFactory } from "./modules/terminals";
+
+const localVue = getLocalVue();
+
+function propsForStep(step: Step) {
+    return {
+        output: step.outputs[0],
+        workflowOutputs: [],
+        stepType: step.type,
+        stepId: step.id,
+        postJobActions: step.post_job_actions,
+        stepPosition: step.position,
+        rootOffset: mockOffset,
+        parentOffset: mockOffset,
+        scroll: { x: ref(0), y: ref(0) },
+        scale: 1,
+        datatypesMapper: testDatatypesMapper,
+    };
+}
+
+function stepForLabel(label: string, steps: Steps) {
+    const step = Object.values(steps).find((step) => step.label === label);
+    if (!step) {
+        throw "step not found for test";
+    }
+    return step;
+}
+
+const transform = ref({ x: 0, y: 0, k: 1 });
+
+describe("NodeOutput", () => {
+    let pinia: ReturnType<typeof createPinia>;
+    let stepStore: ReturnType<typeof useWorkflowStepStore>;
+
+    beforeEach(() => {
+        pinia = createPinia();
+        setActivePinia(pinia);
+        stepStore = useWorkflowStepStore();
+        Object.values(advancedSteps).map((step) => stepStore.addStep(step));
+    });
+
+    it("does not display multiple icon if not mapped over", async () => {
+        const simpleDataStep = stepForLabel("simple data", stepStore.steps);
+        const propsData = propsForStep(simpleDataStep);
+        const wrapper = shallowMount(NodeOutput, {
+            propsData: propsData,
+            localVue,
+            pinia,
+            provide: { transform },
+        });
+        expect(wrapper.find(".multiple").exists()).toBe(false);
+    });
+    it("displays multiple icon if not mapped over", async () => {
+        const simpleDataStep = stepForLabel("simple data", stepStore.steps);
+        const listInputStep = stepForLabel("list input", stepStore.steps);
+        const inputTerminal = terminalFactory(simpleDataStep.id, simpleDataStep.inputs[0], testDatatypesMapper);
+        const outputTerminal = terminalFactory(listInputStep.id, listInputStep.outputs[0], testDatatypesMapper);
+        const propsData = propsForStep(simpleDataStep);
+        const wrapper = shallowMount(NodeOutput, {
+            propsData: propsData,
+            localVue,
+            pinia,
+            provide: { transform },
+        });
+        expect(wrapper.find(".multiple").exists()).toBe(false);
+        inputTerminal.connect(outputTerminal);
+        await nextTick();
+        expect(wrapper.find(".multiple").exists()).toBe(true);
+        inputTerminal.disconnect(outputTerminal);
+        await nextTick();
+        expect(wrapper.find(".multiple").exists()).toBe(false);
+    });
+});
diff --git a/client/src/components/Workflow/Editor/NodeOutput.vue b/client/src/components/Workflow/Editor/NodeOutput.vue
index 3209904d101..6500330a335 100644
--- a/client/src/components/Workflow/Editor/NodeOutput.vue
+++ b/client/src/components/Workflow/Editor/NodeOutput.vue
@@ -1,64 +1,270 @@
 <template>
     <div class="form-row dataRow output-data-row">
         <div
-            v-if="showCallout"
+            v-if="showCalloutActiveOutput"
             v-b-tooltip
             :class="['callout-terminal', output.name]"
             title="Unchecked outputs will be hidden and are not available as subworkflow outputs."
-            @click="onToggle">
+            @keyup="onToggleActive"
+            @click="onToggleActive">
             <i :class="['mark-terminal', activeClass]" />
         </div>
-        {{ label }}
-        <div :id="id" ref="terminal" :output-name="output.name" :class="terminalClass">
-            <div class="icon" />
+        <div
+            v-if="showCalloutVisible"
+            v-b-tooltip
+            :class="['callout-terminal', output.name]"
+            :title="visibleHint"
+            @keyup="onToggleVisible"
+            @click="onToggleVisible">
+            <i :class="['mark-terminal', visibleClass]" />
         </div>
+        {{ label }}
+        <draggable-wrapper
+            :id="id"
+            ref="el"
+            :class="terminalClass"
+            :output-name="output.name"
+            :root-offset="rootOffset"
+            :prevent-default="false"
+            :stop-propagation="true"
+            :drag-data="{ stepId: stepId, output: effectiveOutput }"
+            draggable="true"
+            @pan-by="onPanBy"
+            @start="isDragging = true"
+            @stop="onStopDragging"
+            @move="onMove">
+            <div
+                ref="icon"
+                class="icon prevent-zoom"
+                tabindex="0"
+                :aria-label="`Connect output ${output.name} to input. Press space to see a list of available inputs`"
+                @keyup.space="toggleChildComponent"
+                @keyup.enter="toggleChildComponent"
+                @keyup.esc="toggleChildComponent">
+                <connection-menu
+                    v-if="showChildComponent"
+                    ref="menu"
+                    :terminal="terminal"
+                    @closeMenu="closeMenu"></connection-menu>
+            </div>
+        </draggable-wrapper>
     </div>
 </template>
 
 <script>
-import Terminals from "./modules/terminals";
-import { OutputDragging } from "./modules/dragging";
-import Connector from "./modules/connector";
+import DraggableWrapper from "./DraggablePan";
+import { useCoordinatePosition } from "./composables/useCoordinatePosition";
+import { useTerminal } from "./composables/useTerminal";
+import { ref, computed, watch, nextTick, toRefs } from "vue";
+import { DatatypesMapperModel } from "@/components/Datatypes/model";
+import { useWorkflowStateStore } from "@/stores/workflowEditorStateStore";
+import ConnectionMenu from "@/components/Workflow/Editor/ConnectionMenu";
+import { useWorkflowStepStore } from "@/stores/workflowStepStore";
 
 export default {
+    components: {
+        ConnectionMenu,
+        DraggableWrapper,
+    },
     props: {
         output: {
             type: Object,
             required: true,
         },
-        getNode: {
-            type: Function,
+        workflowOutputs: {
+            type: Array,
             required: true,
         },
-        getManager: {
-            type: Function,
+        stepType: {
+            type: String,
+            required: true,
+        },
+        stepId: {
+            type: Number,
             required: true,
         },
         postJobActions: {
             type: Object,
             required: true,
         },
+        stepPosition: {
+            type: Object,
+            required: true,
+        },
+        rootOffset: {
+            type: Object,
+            required: true,
+        },
+        scroll: {
+            type: Object,
+            required: true,
+        },
+        scale: {
+            type: Number,
+            required: true,
+        },
+        datatypesMapper: {
+            type: DatatypesMapperModel,
+            required: true,
+        },
+    },
+    setup(props) {
+        const stateStore = useWorkflowStateStore();
+        const stepStore = useWorkflowStepStore();
+        const el = ref(null);
+        const { rootOffset, stepPosition, output, stepId, datatypesMapper } = toRefs(props);
+        const position = useCoordinatePosition(el, rootOffset, stepPosition);
+        const extensions = computed(() => {
+            const changeDatatype =
+                props.postJobActions[`ChangeDatatypeAction${props.output.label}`] ||
+                props.postJobActions[`ChangeDatatypeAction${props.output.name}`];
+            let extensions =
+                changeDatatype?.action_arguments.newtype ||
+                props.output.extensions ||
+                props.output.type ||
+                "unspecified";
+            if (!Array.isArray(extensions)) {
+                extensions = [extensions];
+            }
+            return extensions;
+        });
+        const effectiveOutput = ref({ ...output.value, extensions: extensions.value });
+        watch(extensions, () => {
+            effectiveOutput.value = { ...output.value, extensions: extensions.value };
+        });
+        const { terminal, isMappedOver: isMultiple } = useTerminal(stepId, effectiveOutput, datatypesMapper);
+
+        const workflowOutput = computed(() =>
+            props.workflowOutputs.find((workflowOutput) => workflowOutput.output_name == props.output.name)
+        );
+        const activeClass = computed(() => workflowOutput.value && "mark-terminal-active");
+        const isVisible = computed(() => {
+            const isHidden = `HideDatasetAction${props.output.name}` in props.postJobActions;
+            return !isHidden;
+        });
+        const visibleClass = computed(() => (isVisible.value ? "mark-terminal-visible" : "mark-terminal-hidden"));
+        const visibleHint = computed(() => {
+            if (isVisible.value) {
+                return `Output will be visible in history. Click to hide output.`;
+            } else {
+                return `Output will be hidden in history. Click to make output visible.`;
+            }
+        });
+        const label = computed(() => {
+            const activeLabel = workflowOutput.value?.label || props.output.name;
+            return `${activeLabel} (${extensions.value.join(", ")})`;
+        });
+
+        const menu = ref(null);
+        const icon = ref(null);
+        const showChildComponent = ref(false);
+
+        function closeMenu() {
+            showChildComponent.value = false;
+        }
+
+        async function toggleChildComponent() {
+            showChildComponent.value = !showChildComponent.value;
+            if (showChildComponent.value) {
+                await nextTick();
+                menu.value.$el.focus();
+            } else {
+                icon.value.focus();
+            }
+        }
+
+        function onToggleActive() {
+            const step = stepStore.getStep(stepId.value);
+            if (workflowOutput.value) {
+                console.log("wfo", workflowOutput.value);
+                step.workflow_outputs = step.workflow_outputs.filter(
+                    (workflowOutput) => workflowOutput.output_name !== output.value.name
+                );
+            } else {
+                step.workflow_outputs.push({ output_name: output.value.name });
+            }
+            stepStore.updateStep(step);
+        }
+
+        function onToggleVisible() {
+            const actionKey = `HideDatasetAction${props.output.name}`;
+            const step = stepStore.getStep(stepId.value);
+            if (isVisible.value) {
+                step.post_job_actions = {
+                    ...step.post_job_actions,
+                    [actionKey]: {
+                        action_type: "HideDatasetAction",
+                        output_name: props.output.name,
+                        action_arguments: {},
+                    },
+                };
+            } else {
+                const { [actionKey]: ignoreUnused, ...newPostJobActions } = step.post_job_actions;
+                step.post_job_actions = newPostJobActions;
+            }
+            stepStore.updateStep(step);
+        }
+
+        return {
+            el,
+            icon,
+            position,
+            activeClass,
+            visibleClass,
+            visibleHint,
+            isVisible,
+            terminal,
+            isMultiple,
+            label,
+            stateStore,
+            menu,
+            showChildComponent,
+            toggleChildComponent,
+            closeMenu,
+            effectiveOutput,
+            onToggleActive,
+            onToggleVisible,
+        };
     },
     data() {
         return {
-            isMultiple: false,
+            isDragging: false,
+            dragX: 0,
+            dragY: 0,
         };
     },
     computed: {
+        terminalPosition() {
+            return Object.freeze({ startX: this.startX, startY: this.startY });
+        },
+        startX() {
+            return this.position.left + this.scroll.x.value / this.scale + this.position.width / 2;
+        },
+        startY() {
+            return this.position.top + this.scroll.y.value / this.scale + this.position.height / 2;
+        },
+        endX() {
+            return (this.dragX || this.startX) + this.scroll.x.value / this.scale;
+        },
+        endY() {
+            return (this.dragY || this.startY) + this.scroll.y.value / this.scale;
+        },
+        dragPosition() {
+            return {
+                startX: this.startX,
+                endX: this.endX,
+                startY: this.startY,
+                endY: this.endY,
+            };
+        },
         id() {
-            const node = this.getNode();
-            return `node-${node.id}-output-${this.output.name}`;
+            return `node-${this.stepId}-output-${this.output.name}`;
         },
-        label() {
-            const activeLabel = this.output.activeLabel || this.output.label || this.output.name;
-            return `${activeLabel} (${this.extensions.join(", ")})`;
+        showCalloutActiveOutput() {
+            return this.stepType === "tool" || this.stepType === "subworkflow";
         },
-        activeClass() {
-            return this.output.activeOutput && "mark-terminal-active";
-        },
-        showCallout() {
-            const node = this.getNode();
-            return node.type == "tool";
+        showCalloutVisible() {
+            return this.stepType === "tool";
         },
         terminalClass() {
             const cls = "terminal output-terminal";
@@ -67,107 +273,36 @@ export default {
             }
             return cls;
         },
-        forcedExtension() {
-            const changeDatatype =
-                this.postJobActions[`ChangeDatatypeAction${this.output.label}`] ||
-                this.postJobActions[`ChangeDatatypeAction${this.output.name}`];
-            return changeDatatype?.action_arguments.newtype;
-        },
-        extensions() {
-            let extensions = this.forcedExtension || this.output.extensions || this.output.type || "unspecified";
-            if (!Array.isArray(extensions)) {
-                extensions = [extensions];
-            }
-            return extensions;
-        },
-        effectiveOutput() {
-            return { ...this.output, extensions: this.extensions };
-        },
     },
     watch: {
-        label() {
-            // See discussion at: https://github.com/vuejs/vue/issues/8030
-            this.$nextTick(() => {
-                this.$emit("onChange");
-            });
+        terminalPosition(position) {
+            this.stateStore.setOutputTerminalPosition(this.stepId, this.output.name, position);
         },
-        effectiveOutput(newOutput) {
-            const oldTerminal = this.terminal;
-            if (oldTerminal instanceof this.terminalClassForOutput(newOutput)) {
-                oldTerminal.update(newOutput);
-                oldTerminal.destroyInvalidConnections();
-            } else {
-                // create new terminal, connect like old terminal, destroy old terminal
-                // this might be a little buggy, we should replace this with proper vue components
-                this.$emit("onRemove", this.output);
-                this.createTerminal(newOutput);
-                this.terminal.connectors = oldTerminal.connectors.map((c) => {
-                    return new Connector(this.getManager().canvasManager, this.terminal, c.inputHandle);
-                });
-                this.terminal.destroyInvalidConnections();
-                oldTerminal.destroy();
+        dragPosition() {
+            if (this.isDragging) {
+                this.$emit("onDragConnector", this.dragPosition, this.terminal);
             }
         },
     },
-    mounted() {
-        this.createTerminal(this.output);
-    },
     beforeDestroy() {
-        this.$emit("onRemove", this.output);
-        this.terminal.destroy();
+        this.stateStore.deleteOutputTerminalPosition({
+            stepId: this.stepId,
+            outputName: this.output.name,
+        });
     },
     methods: {
-        terminalClassForOutput(output) {
-            let terminalClass = Terminals.OutputTerminal;
-            if (output.collection) {
-                terminalClass = Terminals.OutputCollectionTerminal;
-            } else if (output.parameter) {
-                terminalClass = Terminals.OutputParameterTerminal;
-            }
-            return terminalClass;
+        onPanBy(panBy) {
+            this.$emit("pan-by", panBy);
         },
-        createTerminal(output) {
-            const terminalClass = this.terminalClassForOutput(output);
-            const parameters = {
-                node: this.getNode(),
-                name: output.name,
-                element: this.$refs.terminal,
-                optional: output.optional,
-            };
-            if (output.collection) {
-                const collection_type = output.collection_type;
-                const collection_type_source = output.collection_type_source;
-                this.terminal = new terminalClass({
-                    ...parameters,
-                    collection_type: collection_type,
-                    collection_type_source: collection_type_source,
-                    datatypes: this.extensions,
-                });
-            } else if (output.parameter) {
-                this.terminal = new terminalClass({
-                    ...parameters,
-                    type: output.type,
-                });
-            } else {
-                this.terminal = new terminalClass({
-                    ...parameters,
-                    datatypes: this.extensions,
-                });
-            }
-            new OutputDragging(this.getManager(), {
-                el: this.$refs.terminal,
-                terminal: this.terminal,
-            });
-            this.terminal.on("change", this.onChange.bind(this));
-            this.terminal.emit("change");
-            this.$emit("onAdd", this.output, this.terminal);
+        onMove(position, event) {
+            this.dragX = position.x + this.position.width / 2;
+            this.dragY = position.y + this.position.height / 2;
         },
-        onChange() {
-            this.isMultiple = this.terminal.isMappedOver();
-            this.$emit("onChange");
-        },
-        onToggle() {
-            this.$emit("onToggle", this.output.name);
+        onStopDragging(e) {
+            this.isDragging = false;
+            this.dragX = 0;
+            this.dragY = 0;
+            this.$emit("stopDragging");
         },
     },
 };
diff --git a/client/src/components/Workflow/Editor/Options.test.js b/client/src/components/Workflow/Editor/Options.test.js
index 7b9ede186c3..e234b590538 100644
--- a/client/src/components/Workflow/Editor/Options.test.js
+++ b/client/src/components/Workflow/Editor/Options.test.js
@@ -1,5 +1,5 @@
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import Options from "./Options";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/Workflow/Editor/Recommendations.vue b/client/src/components/Workflow/Editor/Recommendations.vue
index af3ce035e64..c8dba630be4 100644
--- a/client/src/components/Workflow/Editor/Recommendations.vue
+++ b/client/src/components/Workflow/Editor/Recommendations.vue
@@ -21,20 +21,16 @@
 import { getToolPredictions } from "./modules/services";
 import { getCompatibleRecommendations } from "./modules/utilities";
 import LoadingSpan from "components/LoadingSpan";
-import { toSimple } from "./modules/model";
 import _l from "utils/localization";
+import { useWorkflowStepStore } from "@/stores/workflowStepStore";
 
 export default {
     components: {
         LoadingSpan,
     },
     props: {
-        getNode: {
-            type: Function,
-            required: true,
-        },
-        getManager: {
-            type: Function,
+        stepId: {
+            type: Number,
             required: true,
         },
         datatypesMapper: {
@@ -42,6 +38,10 @@ export default {
             required: true,
         },
     },
+    setup() {
+        const stepStore = useWorkflowStepStore();
+        return { stepStore };
+    },
     data() {
         return {
             compatibleTools: [],
@@ -63,11 +63,10 @@ export default {
             }
             return toolId;
         },
-        getWorkflowPath(wfSteps, currentNodeId) {
+        getWorkflowPath(currentNodeId) {
             const steps = {};
             const stepNames = {};
-            for (const stpIdx in wfSteps.steps) {
-                const step = wfSteps.steps[stpIdx];
+            Object.values(this.stepStore.steps).map((step) => {
                 const inputConnections = step.input_connections;
                 stepNames[step.id] = this.getToolId(step.content_id);
                 for (const icIdx in inputConnections) {
@@ -80,7 +79,7 @@ export default {
                         steps[step.id.toString()] = prevConn;
                     }
                 }
-            }
+            });
             // recursive call to determine path
             function readPaths(nodeId, ph) {
                 for (const st in steps) {
@@ -109,10 +108,7 @@ export default {
             return stepNameList.join(",");
         },
         loadRecommendations() {
-            const node = this.getNode();
-            const workflow = this.getManager();
-            const workflowSimple = toSimple(workflow);
-            const toolSequence = this.getWorkflowPath(workflowSimple, node.id);
+            const toolSequence = this.getWorkflowPath(this.stepId);
             const requestData = { tool_sequence: toolSequence };
             getToolPredictions(requestData).then((responsePred) => {
                 const predictedData = responsePred.predicted_data;
diff --git a/client/src/components/Workflow/Editor/RefactorConfirmationModal.test.js b/client/src/components/Workflow/Editor/RefactorConfirmationModal.test.js
index 71691f833a5..11685ebb282 100644
--- a/client/src/components/Workflow/Editor/RefactorConfirmationModal.test.js
+++ b/client/src/components/Workflow/Editor/RefactorConfirmationModal.test.js
@@ -1,7 +1,7 @@
 jest.mock("./modules/services");
 
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import RefactorConfirmationModal from "./RefactorConfirmationModal";
 import { refactor } from "./modules/services";
 import flushPromises from "flush-promises";
diff --git a/client/src/components/Workflow/Editor/StateUpgradeModal.vue b/client/src/components/Workflow/Editor/StateUpgradeModal.vue
index 7e6f5e6fcea..102d50136a7 100644
--- a/client/src/components/Workflow/Editor/StateUpgradeModal.vue
+++ b/client/src/components/Workflow/Editor/StateUpgradeModal.vue
@@ -27,7 +27,7 @@ export default {
     props: {
         stateMessages: {
             type: Array,
-            requierd: true,
+            required: true,
         },
         title: {
             type: String,
diff --git a/client/src/components/Workflow/Editor/TerminalConnector.vue b/client/src/components/Workflow/Editor/TerminalConnector.vue
new file mode 100644
index 00000000000..20dfc4a2540
--- /dev/null
+++ b/client/src/components/Workflow/Editor/TerminalConnector.vue
@@ -0,0 +1,40 @@
+<template>
+    <raw-connector
+        v-if="position"
+        :id="connectionId"
+        :position="position"
+        :output-is-mapped-over="outputIsMappedOver"
+        :input-is-mapped-over="inputIsMappedOver"></raw-connector>
+</template>
+
+<script lang="ts" setup>
+import RawConnector from "@/components/Workflow/Editor/Connector.vue";
+import { useWorkflowStateStore } from "@/stores/workflowEditorStateStore";
+import { useWorkflowStepStore } from "@/stores/workflowStepStore";
+import type { Connection } from "@/stores/workflowConnectionStore";
+import { computed } from "vue";
+
+const props = defineProps<{
+    connection: Connection;
+}>();
+
+const stepStore = useWorkflowStepStore();
+const outputIsMappedOver = computed(() => stepStore.stepMapOver[props.connection.output.stepId]?.isCollection);
+const inputIsMappedOver = computed(() => stepStore.stepMapOver[props.connection.input.stepId]?.isCollection);
+
+const stateStore = useWorkflowStateStore();
+const connectionId = computed(() => {
+    return `connection-node-${props.connection.input.stepId}-input-${props.connection.input.name}-node-${props.connection.output.stepId}-output-${props.connection.output.name}`;
+});
+const position = computed(() => {
+    const outputPos = stateStore.getOutputTerminalPosition(
+        props.connection.output.stepId,
+        props.connection.output.name
+    );
+    const inputPos = stateStore.getInputTerminalPosition(props.connection.input.stepId, props.connection.input.name);
+    if (inputPos && outputPos) {
+        return { ...inputPos, ...outputPos };
+    }
+    return null;
+});
+</script>
diff --git a/client/src/components/Workflow/Editor/WorkflowEdges.vue b/client/src/components/Workflow/Editor/WorkflowEdges.vue
new file mode 100644
index 00000000000..b481c7fc5e3
--- /dev/null
+++ b/client/src/components/Workflow/Editor/WorkflowEdges.vue
@@ -0,0 +1,45 @@
+<script setup lang="ts">
+import RawConnector from "./Connector.vue";
+import TerminalConnector from "./TerminalConnector.vue";
+import { computed } from "vue";
+import { useConnectionStore } from "@/stores/workflowConnectionStore";
+import { storeToRefs } from "pinia";
+import type { TerminalPosition } from "@/stores/workflowEditorStateStore";
+import type { OutputTerminals } from "./modules/terminals";
+
+const props = defineProps<{
+    draggingConnection: TerminalPosition | null;
+    draggingTerminal: OutputTerminals | null;
+}>();
+
+const connectionStore = useConnectionStore();
+const { connections } = storeToRefs(connectionStore);
+
+const dragStyle = computed(() => {
+    // TODO: this isn't quite right, but 6 seems to work, probably because it's the outer strokewidth
+    // sync up with Connector.vue ?
+    const strokeWidth = 6;
+    const dragStyle: { [index: string]: string } = {};
+    if (props.draggingConnection) {
+        dragStyle.left = props.draggingConnection.endX - strokeWidth + "px";
+        dragStyle.top = props.draggingConnection.endY - strokeWidth + "px";
+    }
+    return dragStyle;
+});
+</script>
+<template>
+    <div>
+        <div v-if="draggingConnection" class="drag-terminal" :style="dragStyle" />
+        <svg class="canvas-svg node-area">
+            <raw-connector
+                v-if="draggingTerminal && draggingConnection"
+                :position="draggingConnection"
+                :input-is-mapped-over="false"
+                :output-is-mapped-over="draggingTerminal.mapOver.isCollection"></raw-connector>
+            <terminal-connector
+                v-for="connection in connections"
+                :key="connection.id"
+                :connection="connection"></terminal-connector>
+        </svg>
+    </div>
+</template>
diff --git a/client/src/components/Workflow/Editor/WorkflowGraph.vue b/client/src/components/Workflow/Editor/WorkflowGraph.vue
new file mode 100644
index 00000000000..2dfdb7841bc
--- /dev/null
+++ b/client/src/components/Workflow/Editor/WorkflowGraph.vue
@@ -0,0 +1,136 @@
+<template>
+    <div id="workflow-canvas" class="unified-panel-body workflow-canvas">
+        <ZoomControl :zoom-level="scale" :pan="transform" @onZoom="onZoom" @update:pan="panBy" />
+        <div id="canvas-container" ref="canvas" class="canvas-content" @drop.prevent @dragover.prevent>
+            <!-- canvas-background is sibling of node-area because it has a different transform origin, so can't be parent of node-area -->
+            <div class="canvas-background" :style="canvasStyle" />
+            <div class="node-area" :style="canvasStyle">
+                <WorkflowEdges :dragging-terminal="draggingTerminal" :dragging-connection="draggingPosition" />
+                <WorkflowNode
+                    v-for="(step, key) in steps"
+                    :id="step.id"
+                    :key="key"
+                    :name="step.name"
+                    :content-id="step.content_id"
+                    :step="step"
+                    :datatypes-mapper="datatypesMapper"
+                    :active-node-id="activeNodeId"
+                    :root-offset="elementBounding"
+                    :scroll="scroll"
+                    :scale="scale"
+                    @pan-by="panBy"
+                    @stopDragging="onStopDragging"
+                    @onDragConnector="onDragConnector"
+                    @onActivate="onActivate"
+                    @onDeactivate="onDeactivate"
+                    v-on="$listeners" />
+            </div>
+        </div>
+        <workflow-minimap
+            v-if="elementBounding"
+            :steps="steps"
+            :root-offset="elementBounding"
+            :scale="scale"
+            :pan="transform"
+            @pan-by="panBy"
+            @moveTo="moveTo" />
+    </div>
+</template>
+<script lang="ts" setup>
+import ZoomControl from "@/components/Workflow/Editor/ZoomControl.vue";
+import WorkflowNode from "@/components/Workflow/Editor/Node.vue";
+import WorkflowEdges from "@/components/Workflow/Editor/WorkflowEdges.vue";
+import WorkflowMinimap from "@/components/Workflow/Editor/WorkflowMinimap.vue";
+import { computed, provide, reactive, ref, watch, type Ref, type PropType, watchEffect } from "vue";
+import { useElementBounding, useScroll } from "@vueuse/core";
+import { storeToRefs } from "pinia";
+import { useWorkflowStateStore } from "@/stores/workflowEditorStateStore";
+import type { TerminalPosition } from "@/stores/workflowEditorStateStore";
+import { DatatypesMapperModel } from "@/components/Datatypes/model";
+import { useWorkflowStepStore, type Step } from "@/stores/workflowStepStore";
+import { useZoom } from "./composables/useZoom";
+import type { XYPosition } from "@/stores/workflowEditorStateStore";
+import type { OutputTerminals } from "./modules/terminals";
+
+const emit = defineEmits(["transform", "graph-offset", "onRemove", "scrollTo"]);
+const props = defineProps({
+    steps: { type: Object as PropType<{ [index: string]: Step }>, required: true },
+    datatypesMapper: { type: DatatypesMapperModel, required: true },
+    highlightId: { type: null as unknown as PropType<number | null>, default: null },
+    scrollToId: { type: null as unknown as PropType<number | null>, default: null },
+});
+
+const stateStore = useWorkflowStateStore();
+const stepStore = useWorkflowStepStore();
+const { scale, activeNodeId, draggingPosition, draggingTerminal } = storeToRefs(stateStore);
+const canvas: Ref<HTMLElement | null> = ref(null);
+
+const elementBounding = useElementBounding(canvas, { windowResize: false, windowScroll: false });
+const scroll = useScroll(canvas);
+const { transform, panBy, setZoom, moveTo } = useZoom(1, 0.2, 5, canvas, scroll);
+
+const isDragging = ref(false);
+provide("isDragging", isDragging);
+provide("transform", transform);
+
+watch(
+    () => props.scrollToId,
+    () => {
+        if (props.scrollToId !== null) {
+            const { width: stepWidth, height: stepHeight } = stateStore.stepPosition[props.scrollToId];
+            const { position: stepPosition } = stepStore.getStep(props.scrollToId);
+            if (stepPosition) {
+                const { width, height } = reactive(elementBounding);
+                const centerScreenX = width / 2;
+                const centerScreenY = height / 2;
+                const offsetX = centerScreenX - (stepPosition.left + stepWidth / 2);
+                const offsetY = centerScreenY - (stepPosition.top + stepHeight / 2);
+                onZoom(1, { x: offsetX, y: offsetY });
+            } else {
+                console.log("Step has no position");
+            }
+            emit("scrollTo");
+        }
+    }
+);
+
+function onZoom(zoomLevel: number, panTo: XYPosition | null = null) {
+    setZoom(zoomLevel);
+    if (panTo) {
+        panBy({ x: panTo.x - transform.value.x, y: panTo.y - transform.value.y });
+    }
+    stateStore.setScale(zoomLevel);
+}
+function onStopDragging() {
+    stateStore.draggingPosition = null;
+    stateStore.draggingTerminal = null;
+    isDragging.value = false;
+}
+function onDragConnector(position: TerminalPosition, draggingTerminal: OutputTerminals) {
+    stateStore.draggingPosition = position;
+    stateStore.draggingTerminal = draggingTerminal;
+    isDragging.value = true;
+}
+function onActivate(nodeId: number | null) {
+    if (activeNodeId.value !== nodeId) {
+        stateStore.setActiveNode(nodeId);
+    }
+}
+function onDeactivate() {
+    stateStore.setActiveNode(null);
+}
+
+watch(
+    () => transform.value.k,
+    () => stateStore.setScale(transform.value.k)
+);
+
+watch(transform, () => emit("transform", transform.value));
+watchEffect(() => {
+    emit("graph-offset", reactive(elementBounding));
+});
+
+const canvasStyle = computed(() => {
+    return { transform: `translate(${transform.value.x}px, ${transform.value.y}px) scale(${transform.value.k})` };
+});
+</script>
diff --git a/client/src/components/Workflow/Editor/WorkflowMinimap.vue b/client/src/components/Workflow/Editor/WorkflowMinimap.vue
new file mode 100644
index 00000000000..09890756cf4
--- /dev/null
+++ b/client/src/components/Workflow/Editor/WorkflowMinimap.vue
@@ -0,0 +1,171 @@
+<template>
+    <div ref="overview" class="workflow-overview" :style="style" aria-hidden="true">
+        <div class="workflow-overview-body" @click="onClick">
+            <svg width="100%" height="100%" :viewBox="viewBox">
+                <MinimapNode v-for="step of Object.values(steps)" :key="step.id" class="mini-node" :step="step" />
+                <rect
+                    ref="rect"
+                    class="viewport"
+                    :x="visible.x"
+                    :y="visible.y"
+                    :width="visible.width"
+                    :height="visible.height"
+                    stroke-width="1%"
+                    rx="1%"
+                    fill="white"
+                    fill-opacity="0.5"
+                    @click.stop />
+            </svg>
+        </div>
+    </div>
+</template>
+<script>
+import MinimapNode from "./MinimapNode.vue";
+import { computed, reactive, ref } from "vue";
+import { useDraggable, UseElementBoundingReturn } from "@vueuse/core";
+import { useWorkflowStateStore } from "@/stores/workflowEditorStateStore";
+
+export default {
+    components: {
+        MinimapNode,
+    },
+    props: {
+        steps: {
+            type: Object,
+            required: true,
+        },
+        width: {
+            type: Number,
+            default: 200,
+        },
+        height: {
+            type: Number,
+            default: 200,
+        },
+        scale: {
+            type: Number,
+            default: 1,
+        },
+        pan: {
+            type: Object,
+            default() {
+                return { x: 0, y: 0 };
+            },
+        },
+        rootOffset: {
+            type: UseElementBoundingReturn,
+            required: true,
+        },
+    },
+    setup(props, { emit }) {
+        const overview = ref(null);
+        const overviewPosition = reactive(useDraggable(overview, { preventDefault: true, exact: true }));
+        const size = ref(parseInt(localStorage.getItem("overview-size")) || 150);
+        const visible = computed(() => {
+            const x = props.pan.x / -props.scale;
+            const y = props.pan.y / -props.scale;
+            const width = props.rootOffset.width / props.scale;
+            const height = props.rootOffset.bottom / props.scale;
+            const rval = { x, y, width, height };
+            return rval;
+        });
+        const stepStore = useWorkflowStateStore();
+        const bounds = computed(() => {
+            let left = props.pan.x * -1;
+            let right = props.rootOffset.width;
+            let top = props.pan.y * -1;
+            let bottom = props.rootOffset.bottom;
+            Object.values(props.steps).forEach((step) => {
+                const stepPosition = stepStore.stepPosition[step.id];
+                left = Math.min(left, step.position.left);
+                right = Math.max(right, stepPosition.right);
+                top = Math.min(top, step.position.top);
+                bottom = Math.max(bottom, stepPosition.bottom);
+            });
+
+            return {
+                left: left / props.scale,
+                right: right / props.scale,
+                top: top / props.scale,
+                bottom: bottom / props.scale,
+            };
+        });
+        const scaleFactorX = computed(() => {
+            return (bounds.value.right - bounds.value.left) / size.value;
+        });
+        const scaleFactorY = computed(() => {
+            return (bounds.value.bottom - bounds.value.top) / size.value;
+        });
+        const rect = ref(null);
+        let startX = null;
+        let startY = null;
+        const rectPosition = reactive(
+            useDraggable(rect, {
+                onStart: (position, event) => {
+                    startX = event.clientX;
+                    startY = event.clientY;
+                },
+                onMove: (position, event) => {
+                    const offsetX = event.clientX - startX;
+                    const offsetY = event.clientY - startY;
+                    emit("pan-by", { x: -offsetX * scaleFactorX.value, y: -offsetY * scaleFactorY.value });
+                    startX = event.clientX;
+                    startY = event.clientY;
+                },
+            })
+        );
+        return {
+            overview,
+            overviewPosition,
+            rect,
+            rectPosition,
+            size,
+            visible,
+            bounds,
+            scaleFactorX,
+            scaleFactorY,
+            startX,
+            startY,
+        };
+    },
+    data() {
+        return {
+            maxSize: 300,
+            minSize: 50,
+        };
+    },
+    computed: {
+        style() {
+            if (this.overviewPosition.x) {
+                let newSize = Math.max(
+                    this.rootOffset.right - this.overviewPosition.x,
+                    this.rootOffset.bottom - this.overviewPosition.y
+                );
+                if (newSize > this.maxSize) {
+                    newSize = this.maxSize;
+                } else if (newSize < this.minSize) {
+                    newSize = this.minSize;
+                }
+                if (!this.overviewPosition.isDragging) {
+                    localStorage.setItem("overview-size", newSize);
+                }
+                this.setSize(newSize);
+            }
+            return { width: `${this.size}px`, height: `${this.size}px` };
+        },
+        viewBox() {
+            return `${this.bounds.left} ${this.bounds.top} ${this.bounds.right} ${this.bounds.bottom}`;
+        },
+    },
+    methods: {
+        setSize(size) {
+            this.size = size;
+        },
+        onClick(e) {
+            const x = e.offsetX * this.scaleFactorX;
+            const y = e.offsetY * this.scaleFactorY;
+            this.$emit("moveTo", { x, y });
+        },
+    },
+};
+</script>
diff --git a/client/src/components/Workflow/Editor/ZoomControl.test.js b/client/src/components/Workflow/Editor/ZoomControl.test.js
index 907a0444d01..16d44132f9b 100644
--- a/client/src/components/Workflow/Editor/ZoomControl.test.js
+++ b/client/src/components/Workflow/Editor/ZoomControl.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import ZoomControl from "./ZoomControl";
 
 jest.mock("app");
@@ -9,17 +9,17 @@ describe("ZoomControl", () => {
         const localVue = getLocalVue();
         const wrapper = mount(ZoomControl, {
             propsData: {
-                zoomLevel: 10,
+                zoomLevel: 1,
             },
             localVue,
         });
         const buttons = wrapper.findAll("button");
         expect(buttons.length).toBe(3);
         await buttons.at(0).trigger("click");
-        expect(wrapper.emitted().onZoom[0][0]).toBe(9);
+        expect(wrapper.emitted().onZoom[0][0]).toBe(0.9);
         await buttons.at(1).trigger("click");
-        expect(wrapper.emitted().onZoom[1][0]).toBe(7);
+        expect(wrapper.emitted().onZoom[1][0]).toBe(1);
         await buttons.at(2).trigger("click");
-        expect(wrapper.emitted().onZoom[2][0]).toBe(11);
+        expect(wrapper.emitted().onZoom[2][0]).toBe(1.1);
     });
 });
diff --git a/client/src/components/Workflow/Editor/ZoomControl.vue b/client/src/components/Workflow/Editor/ZoomControl.vue
index dfd7263f45d..755d89343e4 100644
--- a/client/src/components/Workflow/Editor/ZoomControl.vue
+++ b/client/src/components/Workflow/Editor/ZoomControl.vue
@@ -2,6 +2,7 @@
     <span class="zoom-control float-right btn-group-horizontal">
         <b-button
             v-b-tooltip.hover
+            :disabled="isMin"
             role="button"
             class="fa fa-minus"
             title="Zoom Out"
@@ -21,6 +22,7 @@
         </b-button>
         <b-button
             v-b-tooltip.hover
+            :disabled="isMax"
             role="button"
             class="fa fa-plus"
             title="Zoom In"
@@ -30,42 +32,52 @@
     </span>
 </template>
 
-<script>
-import Vue from "vue";
+<script lang="ts" setup>
+import Vue, { computed } from "vue";
 import BootstrapVue from "bootstrap-vue";
-import { zoomLevels, defaultZoomLevel } from "./modules/canvas";
 
 Vue.use(BootstrapVue);
 
-export default {
-    props: {
-        zoomLevel: {
-            type: Number,
-            required: true,
-        },
-    },
-    data() {
-        return {
-            zoomDefault: defaultZoomLevel,
-        };
-    },
-    computed: {
-        zoomPercentage() {
-            return Math.floor(zoomLevels[this.zoomLevel] * 100);
-        },
-    },
-    methods: {
-        onZoomIn() {
-            this.$emit("onZoom", this.zoomLevel + 1);
-        },
-        onZoomOut() {
-            this.$emit("onZoom", this.zoomLevel - 1);
-        },
-        onZoomReset() {
-            this.$emit("onZoom", this.zoomDefault);
-        },
-    },
-};
+const props = withDefaults(
+    defineProps<{
+        zoomLevel: number;
+    }>(),
+    {
+        zoomLevel: 1,
+    }
+);
+const emit = defineEmits(["onZoom"]);
+
+const zoomDefault = 1;
+const zoomLevels = [0.1, 0.2, 0.25, 0.33, 0.5, 0.67, 0.75, 0.8, 0.9, 1, 1.1, 1.25, 1.33, 1.5, 2, 2.5, 3, 4, 5];
+const isMin = computed(() => Math.round(props.zoomLevel * 100) == Math.round(zoomLevels[0] * 100));
+const isMax = computed(() => Math.round(props.zoomLevel * 100) == Math.round(zoomLevels.at(-1)! * 100));
+const zoomPercentage = computed(() => Math.round(props.zoomLevel * 100));
+const index = computed(() => {
+    let index = zoomLevels.indexOf(props.zoomLevel);
+    if (index < 0) {
+        const closest = zoomLevels.reduce((prev, curr) => {
+            return Math.abs(curr - props.zoomLevel) < Math.abs(prev - props.zoomLevel) ? curr : prev;
+        });
+        index = zoomLevels.indexOf(closest);
+    }
+    return index;
+});
+function onZoomIn() {
+    const zoomLevel = zoomLevels[index.value + 1];
+    if (zoomLevel) {
+        emit("onZoom", zoomLevel);
+    }
+}
+function onZoomOut() {
+    const zoomLevel = zoomLevels[index.value - 1];
+    if (zoomLevel) {
+        emit("onZoom", zoomLevel);
+    }
+}
+function onZoomReset() {
+    emit("onZoom", zoomDefault);
+}
 </script>
 
 <style scoped>
diff --git a/client/src/components/Workflow/Editor/composables/useCoordinatePosition.ts b/client/src/components/Workflow/Editor/composables/useCoordinatePosition.ts
new file mode 100644
index 00000000000..cfde785acc2
--- /dev/null
+++ b/client/src/components/Workflow/Editor/composables/useCoordinatePosition.ts
@@ -0,0 +1,51 @@
+import { reactive, watchEffect, inject, type UnwrapRef, type Ref } from "vue";
+import { useElementBounding, type MaybeComputedElementRef, type UseElementBoundingReturn } from "@vueuse/core";
+import type { Step } from "@/stores/workflowStepStore";
+import type { ZoomTransform } from "d3-zoom";
+
+export type ElementBounding = UnwrapRef<UseElementBoundingReturn>;
+
+/**
+ * Return the element position relative to the child of the element that determines rootOffset
+ * @param {MaybeComputedElementRef} target - HTML element reference for which to calculate coordinates
+ * @param {Object} rootOffset - Bounding rectangle of element that determines the canvas coordinates
+ * @param {Object} parentOffset - Bounding rectangle of direct parent.
+ */
+export function useCoordinatePosition(
+    target: MaybeComputedElementRef,
+    rootOffset: Ref<ElementBounding>,
+    stepPosition: Ref<NonNullable<Step["position"]>>
+) {
+    const elementBounding = useElementBounding(target, { windowResize: false });
+    const transform = inject("transform") as Ref<ZoomTransform>;
+    let position: ElementBounding = reactive(elementBounding);
+
+    watchEffect(() => {
+        /*
+         * Touch parentOffset to establish dependency, so that changes in parentOffset
+         * force an update of child coordinates, think addition/removal of extra outputs,
+         * adding a long label, etc.
+         *
+         * Maybe this can be simplified ? I think the way I'm using reactive I'm dismissing updated values from useCoordinatePosition run
+         * before I hit watchEffect
+         */
+        position = reactive(elementBounding);
+        stepPosition.value.left;
+        stepPosition.value.top;
+        const offset = reactive(rootOffset.value);
+        position.update();
+        // Apply scale and offset so that position is in an unscaled coordinate system
+        applyTransform(position, offset, transform.value);
+    });
+    return position;
+}
+
+export function applyTransform(position: ElementBounding, offset: ElementBounding, transform: ZoomTransform) {
+    position.top = (position.top - offset.top - transform.y) / transform.k;
+    position.left = (position.left - offset.left - transform.x) / transform.k;
+    position.width /= transform.k;
+    position.height /= transform.k;
+    position.bottom = position.top + position.height;
+    position.right = position.left + position.width;
+    return position;
+}
diff --git a/client/src/components/Workflow/Editor/composables/useDefaultStepPosition.ts b/client/src/components/Workflow/Editor/composables/useDefaultStepPosition.ts
new file mode 100644
index 00000000000..de3937b37db
--- /dev/null
+++ b/client/src/components/Workflow/Editor/composables/useDefaultStepPosition.ts
@@ -0,0 +1,25 @@
+import type { ZoomTransform } from "d3-zoom";
+import type { ElementBounding } from "./useCoordinatePosition";
+
+const MIN_OFFSET = -50;
+const MAX_OFFSET = 50;
+const NODE_WIDTH = 200;
+const NODE_HEIGHT = 50;
+// To insert a node close to the center (+/- 50px) of the canvas
+// we subtract 100 from MIN/MAX (which are just guesses, they're defined in REM)
+const MIN_OFFSET_SHIFT_X = MIN_OFFSET - NODE_WIDTH / 2;
+const MAX_OFFSET_SHIFT_X = MAX_OFFSET - NODE_WIDTH / 2;
+const MIN_OFFSET_SHIFT_Y = MIN_OFFSET - NODE_HEIGHT / 2;
+const MAX_OFFSET_SHIFT_Y = MAX_OFFSET - NODE_HEIGHT / 2;
+
+export function defaultPosition(rootOffset: ElementBounding, transform: ZoomTransform) {
+    const left =
+        (-transform.x + rootOffset.width / 2 + randomInteger(MIN_OFFSET_SHIFT_X, MAX_OFFSET_SHIFT_X)) / transform.k;
+    const top =
+        (-transform.y + rootOffset.height / 2 + randomInteger(MIN_OFFSET_SHIFT_Y, MAX_OFFSET_SHIFT_Y)) / transform.k;
+    return { left, top };
+}
+
+function randomInteger(min: number, max: number) {
+    return Math.floor(Math.random() * (max - min + 1)) + min;
+}
diff --git a/client/src/components/Workflow/Editor/composables/useDraggable.js b/client/src/components/Workflow/Editor/composables/useDraggable.js
new file mode 100644
index 00000000000..40482a981c7
--- /dev/null
+++ b/client/src/components/Workflow/Editor/composables/useDraggable.js
@@ -0,0 +1,127 @@
+import { computed, ref } from "vue-demi";
+import { isClient, resolveUnref, toRefs } from "@vueuse/shared";
+import { useEventListener } from "@vueuse/core";
+
+/**
+ * Make elements draggable.
+ *
+ * @see https://vueuse.org/useDraggable
+ * @param target
+ * @param options
+ */
+export function useDraggable(target, options = {}) {
+    const draggingElement = options.draggingElement ?? window;
+    const draggingHandle = options.handle ?? target;
+    const position = ref(resolveUnref(options.initialValue) ?? { x: 0, y: 0 });
+    const pressedDelta = ref();
+    const cleanUpPointerMove = ref();
+    const cleanUpDragMove = ref();
+
+    const filterEvent = (e) => {
+        if (options.pointerTypes) {
+            return options.pointerTypes.includes(e.pointerType);
+        }
+        return true;
+    };
+
+    const handleEvent = (e) => {
+        if (resolveUnref(options.preventDefault)) {
+            e.preventDefault();
+        }
+        if (resolveUnref(options.stopPropagation)) {
+            e.stopPropagation();
+        }
+    };
+
+    const start = (e) => {
+        if (!filterEvent(e)) {
+            return;
+        }
+        if (resolveUnref(options.exact) && e.target !== resolveUnref(target)) {
+            return;
+        }
+        const rect = resolveUnref(target)?.getBoundingClientRect();
+        const pos = {
+            x: e.clientX - rect.left,
+            y: e.clientY - rect.top,
+        };
+        if (options.onStart?.(pos, e) === false) {
+            return;
+        }
+        pressedDelta.value = pos;
+        // define move inline because the event lister scope never receives updates to the initial pressedDelta value
+        // (interestingly not a problem if using move directly)
+        const move = (e) => {
+            if (!filterEvent(e)) {
+                return;
+            }
+            if (!pressedDelta.value) {
+                return;
+            }
+            position.value = {
+                x: e.clientX - pressedDelta.value.x,
+                y: e.clientY - pressedDelta.value.y,
+            };
+            options.onMove?.(position.value, e);
+            handleEvent(e);
+        };
+        function throttleMove(e) {
+            return throttledWrite(() => move(e));
+        }
+
+        cleanUpPointerMove.value && cleanUpPointerMove.value();
+        cleanUpDragMove.value && cleanUpDragMove.value();
+        cleanUpDragMove.value = useEventListener(window, "dragover", throttleMove, options.useCapture ?? true);
+        cleanUpPointerMove.value = useEventListener(
+            draggingElement,
+            "pointermove",
+            throttleMove,
+            options.useCapture ?? true
+        );
+        handleEvent(e);
+    };
+    const end = (e) => {
+        if (!filterEvent(e)) {
+            return;
+        }
+        if (!pressedDelta.value) {
+            return;
+        }
+        pressedDelta.value = undefined;
+        options.onEnd?.(position.value, e);
+        handleEvent(e);
+        cleanUpPointerMove.value && cleanUpPointerMove.value();
+        cleanUpDragMove.value && cleanUpDragMove.value();
+    };
+
+    if (isClient) {
+        const useCapture = options.useCapture ?? true;
+        useEventListener(draggingHandle, "dragstart", start, useCapture);
+        useEventListener(draggingHandle, "pointerdown", start, useCapture);
+        useEventListener(draggingElement, "dragend", end, useCapture);
+        useEventListener(draggingElement, "pointerup", end, useCapture);
+    }
+
+    return {
+        ...toRefs(position),
+        position,
+        isDragging: computed(() => !!pressedDelta.value),
+        style: computed(() => `left:${position.value.x}px;top:${position.value.y}px;`),
+    };
+}
+
+function throttle(timer) {
+    let queuedCallback;
+    return (callback) => {
+        if (!queuedCallback) {
+            timer(() => {
+                const cb = queuedCallback;
+                queuedCallback = null;
+                cb();
+            });
+        }
+        queuedCallback = callback;
+    };
+}
+
+const throttledWrite = throttle(requestAnimationFrame);
diff --git a/client/src/components/Workflow/Editor/composables/useNodePosition.ts b/client/src/components/Workflow/Editor/composables/useNodePosition.ts
new file mode 100644
index 00000000000..2ce4e85c31d
--- /dev/null
+++ b/client/src/components/Workflow/Editor/composables/useNodePosition.ts
@@ -0,0 +1,16 @@
+import { useElementBounding } from "@vueuse/core";
+import { onUnmounted, reactive, type Ref } from "vue";
+import type { useWorkflowStateStore } from "@/stores/workflowEditorStateStore";
+
+export function useNodePosition(
+    nodeRef: Ref<HTMLElement | null>,
+    stepId: number,
+    workflowStateStore: ReturnType<typeof useWorkflowStateStore>
+) {
+    const position = useElementBounding(nodeRef, { windowResize: false });
+    workflowStateStore.setStepPosition(stepId, reactive(position));
+    onUnmounted(() => {
+        workflowStateStore.deleteStepPosition(stepId);
+    });
+    return position;
+}
diff --git a/client/src/components/Workflow/Editor/composables/useStepProps.ts b/client/src/components/Workflow/Editor/composables/useStepProps.ts
new file mode 100644
index 00000000000..ca13356e2dc
--- /dev/null
+++ b/client/src/components/Workflow/Editor/composables/useStepProps.ts
@@ -0,0 +1,31 @@
+import type { Step } from "@/stores/workflowStepStore";
+import { toRefs } from "@vueuse/core";
+
+import type { Ref } from "vue";
+
+export function useStepProps(step: Ref<Step>) {
+    const {
+        id: stepId,
+        content_id: contentId,
+        annotation,
+        label,
+        name,
+        type,
+        inputs: stepInputs,
+        outputs: stepOutputs,
+        config_form: configForm,
+        post_job_actions: postJobActions,
+    } = toRefs(step);
+    return {
+        stepId,
+        contentId,
+        annotation,
+        label,
+        name,
+        type,
+        stepInputs,
+        stepOutputs,
+        configForm,
+        postJobActions,
+    };
+}
diff --git a/client/src/components/Workflow/Editor/composables/useTerminal.ts b/client/src/components/Workflow/Editor/composables/useTerminal.ts
new file mode 100644
index 00000000000..15e66ce4531
--- /dev/null
+++ b/client/src/components/Workflow/Editor/composables/useTerminal.ts
@@ -0,0 +1,21 @@
+import type { DatatypesMapperModel } from "@/components/Datatypes/model";
+import { terminalFactory } from "@/components/Workflow/Editor/modules/terminals";
+import type { Step, TerminalSource } from "@/stores/workflowStepStore";
+import { ref, watchEffect, type Ref } from "vue";
+
+export function useTerminal(
+    stepId: Ref<Step["id"]>,
+    terminalSource: Ref<TerminalSource>,
+    datatypesMapper: Ref<DatatypesMapperModel>
+) {
+    const terminal = ref();
+    const isMappedOver = ref(false);
+    watchEffect(() => {
+        // rebuild terminal if any of the tracked dependencies change
+        const newTerminal = terminalFactory(stepId.value, terminalSource.value, datatypesMapper.value);
+        newTerminal.destroyInvalidConnections();
+        terminal.value = newTerminal;
+        isMappedOver.value = newTerminal.isMappedOver();
+    });
+    return { terminal: terminal as Ref<ReturnType<typeof terminalFactory>>, isMappedOver };
+}
diff --git a/client/src/components/Workflow/Editor/composables/useUniqueLabelError.ts b/client/src/components/Workflow/Editor/composables/useUniqueLabelError.ts
new file mode 100644
index 00000000000..db69f9e509e
--- /dev/null
+++ b/client/src/components/Workflow/Editor/composables/useUniqueLabelError.ts
@@ -0,0 +1,15 @@
+import type { useWorkflowStepStore } from "@/stores/workflowStepStore";
+import { ref } from "vue";
+
+export function useUniqueLabelError(
+    workflowStateStore: ReturnType<typeof useWorkflowStepStore>,
+    label: string | undefined
+) {
+    const error = ref("");
+    if (label && workflowStateStore.workflowOutputs[label]) {
+        error.value = `Duplicate label ${label}. Please fix this before saving the workflow.`;
+    } else {
+        error.value = "";
+    }
+    return error;
+}
diff --git a/client/src/components/Workflow/Editor/composables/useZoom.ts b/client/src/components/Workflow/Editor/composables/useZoom.ts
new file mode 100644
index 00000000000..76beceb2e4b
--- /dev/null
+++ b/client/src/components/Workflow/Editor/composables/useZoom.ts
@@ -0,0 +1,83 @@
+import { zoom, zoomIdentity, type D3ZoomEvent } from "d3-zoom";
+import { ref, watch } from "vue";
+import { pointer, select } from "d3-selection";
+import type { Ref } from "vue";
+import type { XYPosition } from "@/stores/workflowEditorStateStore";
+import type { UseScrollReturn } from "@vueuse/core";
+
+// if element is draggable it may implement its own drag handler,
+// but d3zoom would call preventDefault
+const filter = (event: any) => {
+    const preventZoom = event.target.classList.contains("prevent-zoom");
+    return !preventZoom;
+};
+
+export function useZoom(
+    k: number,
+    minZoom: number,
+    maxZoom: number,
+    targetRef: Ref<HTMLElement | null>,
+    scroll: UseScrollReturn
+) {
+    const transform = ref({ x: 0, y: 0, k: k });
+    const d3Zoom = zoom<HTMLElement, unknown>().filter(filter).scaleExtent([minZoom, maxZoom]);
+
+    watch(targetRef, () => {
+        if (targetRef.value) {
+            const d3Selection = select(targetRef.value).call(d3Zoom);
+            const updatedTransform = zoomIdentity
+                .translate(transform.value.x, transform.value.y)
+                .scale(transform.value.k);
+            d3Zoom.transform(d3Selection, updatedTransform);
+
+            d3Selection
+                .on("wheel", (event) => {
+                    const currentZoom = d3Selection.property("__zoom").k || 1;
+
+                    const pinchDelta =
+                        -event.deltaY * (event.deltaMode === 1 ? 0.05 : event.deltaMode ? 1 : 0.002) * 10;
+                    const point = pointer(event);
+                    point[0] += scroll.x.value;
+                    point[1] += scroll.y.value;
+                    const zoom = currentZoom * 2 ** pinchDelta;
+                    d3Zoom.scaleTo(d3Selection, zoom, point);
+                })
+                .on("wheel.zoom", null);
+        }
+
+        d3Zoom.on("zoom", (event: D3ZoomEvent<HTMLElement, unknown>) => {
+            transform.value = event.transform;
+        });
+
+        d3Zoom.on("start", (event: D3ZoomEvent<HTMLElement, unknown>) => {
+            transform.value = event.transform;
+        });
+
+        d3Zoom.on("end", (event: D3ZoomEvent<HTMLElement, unknown>) => {
+            transform.value = event.transform;
+        });
+    });
+
+    function setZoom(k: number) {
+        if (targetRef.value) {
+            const d3Selection = select(targetRef.value).call(d3Zoom);
+            d3Zoom.scaleTo(d3Selection, k);
+        }
+    }
+
+    function panBy(panBy: XYPosition) {
+        if (targetRef.value) {
+            const d3Selection = select(targetRef.value).call(d3Zoom);
+            d3Zoom.translateBy(d3Selection, panBy.x, panBy.y);
+        }
+    }
+
+    function moveTo(coordinate: XYPosition) {
+        if (targetRef.value) {
+            const d3Selection = select(targetRef.value).call(d3Zoom);
+            d3Zoom.translateTo(d3Selection, coordinate.x, coordinate.y);
+        }
+    }
+
+    return { transform, setZoom, panBy, moveTo };
+}
diff --git a/client/src/components/Workflow/Editor/modules/aria.js b/client/src/components/Workflow/Editor/modules/aria.js
deleted file mode 100644
index 392a63fa6aa..00000000000
--- a/client/src/components/Workflow/Editor/modules/aria.js
+++ /dev/null
@@ -1,110 +0,0 @@
-import $ from "jquery";
-import ariaAlert from "utils/ariaAlert";
-import Connector from "./connector";
-
-export function ariaSelectOutputNode(options) {
-    const { e, manager, outputTerminal, outputEl } = options;
-    const inputChoicesMenu = document.createElement("ul");
-    const switchActiveItem = (currentActive, newActive) => {
-        newActive.classList.add("active");
-        newActive.focus();
-        currentActive.classList.remove("active");
-    };
-    const removeMenu = () => {
-        inputChoicesMenu.remove();
-        outputEl.removeAttribute("aria-owns");
-        outputEl.setAttribute("aria-grabbed", "false");
-        outputEl.focus();
-    };
-    const inputChoiceKeyDown = (e) => {
-        e.stopPropagation();
-        const currentItem = e.currentTarget;
-        const previousItem = currentItem.previousSibling;
-        const nextItem = currentItem.nextSibling;
-        const inputNodeKey = currentItem.getAttribute("node-key");
-        const inputTerminalKey = currentItem.getAttribute("input-key");
-        const inputTerminal = manager.nodes[inputNodeKey].inputTerminals[inputTerminalKey];
-        let foundConnection = false;
-        switch (e.keyCode) {
-            // Arrow Down
-            case 40:
-                if (nextItem) {
-                    switchActiveItem(currentItem, nextItem);
-                } else {
-                    switchActiveItem(currentItem, currentItem.parentNode.firstChild);
-                }
-                break;
-            // Arrow Up
-            case 38:
-                if (previousItem) {
-                    switchActiveItem(currentItem, previousItem);
-                } else {
-                    switchActiveItem(currentItem, currentItem.parentNode.lastChild);
-                }
-                break;
-            // Space
-            case 32:
-                removeMenu();
-                outputTerminal.connectors.forEach((x) => {
-                    if (x.inputHandle === inputTerminal) {
-                        x.destroy();
-                        foundConnection = true;
-                        ariaAlert("Connection destroyed");
-                    }
-                });
-                if (!foundConnection) {
-                    new Connector(manager.canvasManager, outputTerminal, inputTerminal).redraw();
-                    ariaAlert("Node connected");
-                }
-                break;
-        }
-    };
-    const buildMenu = () => {
-        $(inputChoicesMenu).focusout((e) => {
-            /* focus is still inside child element of menu so don't hide */
-            if (!inputChoicesMenu.contains(e.relatedTarget)) {
-                $(inputChoicesMenu).hide();
-            }
-        });
-        inputChoicesMenu.id = "input-choices-menu";
-        inputChoicesMenu.className = "list-group";
-        inputChoicesMenu.style.position = "absolute";
-        inputChoicesMenu.setAttribute("role", "menu");
-        outputEl.setAttribute("aria-grabbed", "true");
-        outputEl.setAttribute("aria-owns", "input-choices-menu");
-        Object.entries(manager.nodes).forEach(([inputNodeKey, inputNode]) => {
-            Object.entries(inputNode.inputTerminals).forEach(([inputTerminalKey, inputTerminal]) => {
-                const connectionAcceptable = inputTerminal.canAccept(outputTerminal);
-                let foundConnection = false;
-                outputTerminal.connectors.forEach((x) => {
-                    if (x.inputHandle === inputTerminal) {
-                        foundConnection = true;
-                    }
-                });
-                if (connectionAcceptable.canAccept || foundConnection) {
-                    const inputChoiceItem = document.createElement("li");
-                    inputChoiceItem.textContent = `${inputTerminal.name} in ${inputTerminal.node.name} node`;
-                    inputChoiceItem.tabIndex = -1;
-                    inputChoiceItem.onkeydown = inputChoiceKeyDown;
-                    inputChoiceItem.className = "list-group-item";
-                    inputChoiceItem.setAttribute("role", "menuitem");
-                    inputChoiceItem.setAttribute("input-key", inputTerminalKey);
-                    inputChoiceItem.setAttribute("node-key", inputNodeKey);
-                    inputChoicesMenu.appendChild(inputChoiceItem);
-                }
-            });
-        });
-        if (inputChoicesMenu.firstChild) {
-            outputEl.appendChild(inputChoicesMenu);
-            inputChoicesMenu.firstChild.classList.add("active");
-            inputChoicesMenu.firstChild.focus();
-        } else {
-            ariaAlert("There are no available inputs for this selected output");
-        }
-    };
-    // Space
-    if (e.keyCode === 32) {
-        ariaAlert("Node selected");
-        buildMenu();
-    }
-}
diff --git a/client/src/components/Workflow/Editor/modules/canvas.js b/client/src/components/Workflow/Editor/modules/canvas.js
deleted file mode 100644
index 640926b7b3b..00000000000
--- a/client/src/components/Workflow/Editor/modules/canvas.js
+++ /dev/null
@@ -1,521 +0,0 @@
-import $ from "jquery";
-
-// Colors used to render nodes in the workflow overview
-const NODE_COLOR = "#25537b";
-const NODE_HIGHLIGHT_COLOR = "#400404";
-const NODE_ERROR_COLOR = "#e31a1e";
-
-const OVERLAY_HIGHLIGHT_INTERVAL = 20;
-const OVERLAY_HIGHLIGHT_STEPS = 40;
-
-// Zoom levels to use for zooming the workflow canvas
-export const zoomLevels = [0.25, 0.33, 0.5, 0.67, 0.75, 0.8, 0.9, 1, 1.1, 1.25, 1.33, 1.5, 2, 2.5, 3, 4];
-
-// Default zoome level
-export const defaultZoomLevel = 7;
-const inputElementTypes = ["input", "text", "textarea"];
-
-// FIXME: merge scroll panel into CanvasManager, clean up hardcoded stuff.
-class ScrollPanel {
-    constructor(panel) {
-        this.panel = panel;
-    }
-    test(e, onmove) {
-        window.clearTimeout(this.timeout);
-        var x = e.pageX;
-        var y = e.pageY;
-        // Panel size and position
-        var panel = $(this.panel);
-        var panel_pos = panel.position();
-        var panel_w = panel.width();
-        var panel_h = panel.height();
-        // Viewport size and offset
-        var viewport = panel.parent();
-        var viewport_w = viewport.width();
-        var viewport_h = viewport.height();
-        var viewport_offset = viewport.offset();
-        // Edges of viewport (in page coordinates)
-        var min_x = viewport_offset.left;
-        var min_y = viewport_offset.top;
-        var max_x = min_x + viewport.width();
-        var max_y = min_y + viewport.height();
-        // Legal panel range
-        var p_min_x = -(panel_w - viewport_w / 2);
-        var p_min_y = -(panel_h - viewport_h / 2);
-        var p_max_x = viewport_w / 2;
-        var p_max_y = viewport_h / 2;
-        // Did the panel move?
-        var moved = false;
-        // Constants
-        var close_dist = 5;
-        var nudge = 23;
-        var t = 0;
-        if (x - close_dist < min_x) {
-            if (panel_pos.left < p_max_x) {
-                t = Math.min(nudge, p_max_x - panel_pos.left);
-                panel.css("left", panel_pos.left + t);
-                moved = true;
-            }
-        } else if (x + close_dist > max_x) {
-            if (panel_pos.left > p_min_x) {
-                t = Math.min(nudge, panel_pos.left - p_min_x);
-                panel.css("left", panel_pos.left - t);
-                moved = true;
-            }
-        } else if (y - close_dist < min_y) {
-            if (panel_pos.top < p_max_y) {
-                t = Math.min(nudge, p_max_y - panel_pos.top);
-                panel.css("top", panel_pos.top + t);
-                moved = true;
-            }
-        } else if (y + close_dist > max_y) {
-            if (panel_pos.top > p_min_y) {
-                t = Math.min(nudge, panel_pos.top - p_min_x);
-                panel.css("top", `${panel_pos.top - t}px`);
-                moved = true;
-            }
-        }
-        if (moved) {
-            // Keep moving even if mouse doesn't move
-            onmove();
-            this.timeout = window.setTimeout(() => {
-                this.test(e, onmove);
-            }, 50);
-        }
-    }
-    stop() {
-        window.clearTimeout(this.timeout);
-    }
-}
-
-class CanvasManager {
-    constructor(app) {
-        this.app = app;
-        this.cv = $("#canvas-viewport");
-        this.cc = this.cv.find("#canvas-container");
-        this.overview = $("#overview-container");
-        this.oc = this.overview.find("#overview-canvas");
-        this.ov = this.overview.find("#overview-viewport");
-        // Initialize zooming
-        this.zoomLevel = defaultZoomLevel;
-        this.canvasZoom = zoomLevels[defaultZoomLevel];
-        // Make overview box draggable
-        this.init_drag();
-        // Initialize Copy & Paste events
-        this.init_copy_paste();
-        this.init_scroll_zoom();
-        this.isWheeled = false;
-    }
-    setZoom(zoomLevel) {
-        this.isWheeled = false;
-        this.zoomLevel = Math.min(Math.max(0, zoomLevel), zoomLevels.length - 1);
-        this.canvasZoom = zoomLevels[this.zoomLevel];
-        // Set CSS transform to appropriate zoom level
-        this.cv.css("transform-origin", "top left");
-        this.cv.css("transform", "scale(" + this.canvasZoom + ")");
-        // Modify canvas size to account for scale
-        this.cv.css("width", `${100 / this.canvasZoom}%`);
-        this.cv.css("height", `${100 / this.canvasZoom}%`);
-        // Update canvas size
-        this._fitCanvasToNodes();
-        this.drawOverview();
-        return this.zoomLevel;
-    }
-    init_scroll_zoom() {
-        /*
-            The scroll_zoom event binding allows for the functionality of zooming in
-            using the mouse scroll wheel.
-        */
-        // Zooming within canvas background
-        document.getElementById("workflow-canvas").addEventListener("wheel", (e) => {
-            this.isWheeled = true;
-            e.preventDefault();
-            var zoomScale = this.canvasZoom;
-            zoomScale += e.deltaY * -0.001;
-            // // Get value within range of zoom/scale levels (0.25 - 4)
-            zoomScale = Math.min(Math.max(0.25, zoomScale), 4);
-            // Find index (zoomLevel) for the zoom value (canvasZoom)
-            let zoomIndex = 0;
-            while (zoomLevels[zoomIndex] < zoomScale) {
-                zoomIndex++;
-            }
-            // Tried to use setZoom() function but it requires zoomLevel as input
-            // i.e.: won't allow for smooth zooming (will only allow 15 levels
-            // of zoom like in ZoomControl)
-            // this.setZoom(i);
-            this.zoomLevel = zoomIndex;
-            this.canvasZoom = zoomScale;
-            // Set CSS transform to appropriate zoom level
-            this.cv.css("transform-origin", "top left");
-            this.cv.css("transform", "scale(" + this.canvasZoom + ")");
-            // Modify canvas size to account for scale
-            this.cv.css("width", `${100 / this.canvasZoom}%`);
-            this.cv.css("height", `${100 / this.canvasZoom}%`);
-            // Update canvas size
-            this._fitCanvasToNodes();
-            this.drawOverview();
-        });
-    }
-    move(x, y) {
-        x = Math.min(x, this.cv.width() / 2);
-        x = Math.max(x, -this.cc.width() + this.cv.width() / 2);
-        y = Math.min(y, this.cv.height() / 2);
-        y = Math.max(y, -this.cc.height() + this.cv.height() / 2);
-        this.cc.css({
-            left: x,
-            top: y,
-        });
-        this.cv.css({
-            "background-position-x": x,
-            "background-position-y": y,
-        });
-        this.updateViewportOverlay();
-    }
-    init_drag() {
-        var self = this;
-        // Dragging within canvas background
-        this.scrollPanel = new ScrollPanel(this.cc);
-        var x_adjust;
-        var y_adjust;
-        this.cv
-            .bind("click", function () {
-                document.activeElement.blur();
-            })
-            .bind("dragstart", function () {
-                var o = $(this).offset();
-                var p = self.cc.position();
-                y_adjust = p.top - o.top;
-                x_adjust = p.left - o.left;
-            })
-            .bind("drag", (e, d) => {
-                this.move((d.offsetX + x_adjust) / this.canvasZoom, (d.offsetY + y_adjust) / this.canvasZoom);
-            })
-            .bind("dragend", () => {
-                self.drawOverview();
-            });
-        this.overview.click((e) => {
-            if (self.overview.hasClass("blockaclick")) {
-                self.overview.removeClass("blockaclick");
-            } else {
-                var in_w = self.cc.width();
-                var in_h = self.cc.height();
-                var o_w = self.oc.width();
-                var o_h = self.oc.height();
-                var new_x_offset = e.pageX - self.oc.offset().left - self.ov.width() / 2;
-                var new_y_offset = e.pageY - self.oc.offset().top - self.ov.height() / 2;
-                this.move(-((new_x_offset / o_w) * in_w), -((new_y_offset / o_h) * in_h));
-                this.drawOverview();
-            }
-        });
-        // Dragging for overview pane
-        this.ov
-            .bind("drag", (e, d) => {
-                var in_w = self.cc.width();
-                var in_h = self.cc.height();
-                var o_w = self.oc.width();
-                var o_h = self.oc.height();
-                var new_x_offset = d.offsetX - self.overview.offset().left;
-                var new_y_offset = d.offsetY - self.overview.offset().top;
-                this.move(-((new_x_offset / o_w) * in_w), -((new_y_offset / o_h) * in_h));
-            })
-            .bind("dragend", () => {
-                self.overview.addClass("blockaclick");
-                self.drawOverview();
-            });
-        // Dragging for overview border (resize)
-        $(".workflow-overview").bind("drag", function (e, d) {
-            var op = $(this).offsetParent();
-            var opo = op.offset();
-            var new_size = Math.max(op.width() - (d.offsetX - opo.left), op.height() - (d.offsetY - opo.top));
-            $(this).css({
-                width: new_size,
-                height: new_size,
-            });
-            self.drawOverview();
-        });
-        /*  Disable dragging for child element of the panel so that resizing can
-                only be done by dragging the borders */
-        $(".workflow-overview div").bind("drag", () => {});
-
-        // Stores the size of the overview into local storage when it's resized
-        $(".workflow-overview").bind("dragend", function (e, d) {
-            const op = $(this).offsetParent();
-            const opo = op.offset();
-            const new_size = Math.max(op.width() - (d.offsetX - opo.left), op.height() - (d.offsetY - opo.top));
-            localStorage.setItem("overview-size", `${new_size}px`);
-        });
-
-        // On load, set the size to the pref stored in local storage if it exists
-        const overview_size = localStorage.getItem("overview-size");
-        if (overview_size !== undefined) {
-            $(".workflow-overview").css({
-                width: overview_size,
-                height: overview_size,
-            });
-        }
-    }
-    init_copy_paste() {
-        /*
-            The copy/paste event bindings check the active element
-            and, if it's one of the text inputs, skip the workflow copy/paste
-            logic so we don't interfere with standard copy/paste functionality.
-            The copy binding also skips the node copy if text is currently highlighted.
-        */
-        document.addEventListener("copy", (e) => {
-            if (
-                document.activeElement &&
-                !inputElementTypes.includes(document.activeElement.type) &&
-                !document.getSelection().toString()
-            ) {
-                if (this.app.activeNode && this.app.activeNode.type !== "subworkflow") {
-                    e.clipboardData.setData(
-                        "application/json",
-                        JSON.stringify({
-                            nodeId: this.app.activeNode.id,
-                        })
-                    );
-                    e.preventDefault();
-                }
-            }
-        });
-        document.addEventListener("paste", (e) => {
-            if (document.activeElement && !inputElementTypes.includes(document.activeElement.type)) {
-                let nodeId;
-                try {
-                    nodeId = JSON.parse(e.clipboardData.getData("application/json")).nodeId;
-                } catch (error) {
-                    console.debug(error);
-                }
-                if (nodeId && this.app.nodes[nodeId]) {
-                    this.app.nodes[nodeId].onClone();
-                }
-                e.preventDefault();
-            }
-        });
-    }
-    updateViewportOverlay() {
-        var cc = this.cc;
-        var cv = this.cv;
-        var oc = this.oc;
-        var ov = this.ov;
-        var in_w = cc.width();
-        var in_h = cc.height();
-        var o_w = oc.width();
-        var o_h = oc.height();
-        var cc_pos = cc.position();
-        ov.css({
-            left: -((cc_pos.left / in_w) * o_w),
-            top: -((cc_pos.top / in_h) * o_h),
-            // Subtract 2 to account for borders (maybe just change box sizing style instead?)
-            width: (cv.width() / in_w) * o_w - 2,
-            height: (cv.height() / in_h) * o_h - 2,
-        });
-    }
-    drawOverview() {
-        this._fitCanvasToNodes();
-        var canvas_el = $("#overview-canvas");
-        var size = canvas_el.parent().parent().width();
-        var c = canvas_el.get(0).getContext("2d");
-        var in_w = $("#canvas-container").width();
-        var in_h = $("#canvas-container").height();
-        var o_h;
-        var shift_h;
-        var o_w;
-        var shift_w;
-        // Fit canvas into overview area
-        var cv_w = this.cv.width();
-        var cv_h = this.cv.height();
-        if (in_w < cv_w && in_h < cv_h) {
-            // Canvas is smaller than viewport
-            o_w = (in_w / cv_w) * size;
-            shift_w = (size - o_w) / 2;
-            o_h = (in_h / cv_h) * size;
-            shift_h = (size - o_h) / 2;
-        } else if (in_w < in_h) {
-            // Taller than wide
-            shift_h = 0;
-            o_h = size;
-            o_w = Math.ceil((o_h * in_w) / in_h);
-            shift_w = (size - o_w) / 2;
-        } else {
-            // Wider than tall
-            o_w = size;
-            shift_w = 0;
-            o_h = Math.ceil((o_w * in_h) / in_w);
-            shift_h = (size - o_h) / 2;
-        }
-        canvas_el.parent().css({
-            left: shift_w,
-            top: shift_h,
-            width: o_w,
-            height: o_h,
-        });
-        canvas_el.attr("width", o_w);
-        canvas_el.attr("height", o_h);
-
-        const drawOverlayRectFor = (nodeElement, color) => {
-            const position = nodeElement.position();
-            const x = (position.left / in_w) * o_w;
-            const y = (position.top / in_h) * o_h;
-            const w = (nodeElement.width() / in_w) * o_w;
-            const h = (nodeElement.height() / in_h) * o_h;
-            c.fillStyle = color;
-            c.fillRect(x, y, w, h);
-        };
-
-        this.highlightInOverlay = (node) => {
-            const nodeElement = $(node.element);
-            let i = 0;
-            let colorTarget = NODE_COLOR;
-            if (node.errors) {
-                colorTarget = NODE_ERROR_COLOR;
-            }
-            const ramp = getRamp(NODE_HIGHLIGHT_COLOR, colorTarget, OVERLAY_HIGHLIGHT_STEPS);
-            const interval = setInterval(function () {
-                i++;
-                drawOverlayRectFor(nodeElement, ramp[i]);
-                if (i === OVERLAY_HIGHLIGHT_STEPS) {
-                    clearInterval(interval);
-                }
-            }, OVERLAY_HIGHLIGHT_INTERVAL);
-        };
-        // Draw overview
-        $.each(this.app.nodes, (id, node) => {
-            const nodeElement = $(node.element);
-            let color = NODE_COLOR;
-            if (node.errors) {
-                color = NODE_ERROR_COLOR;
-            }
-            drawOverlayRectFor(nodeElement, color);
-        });
-        this.updateViewportOverlay();
-    }
-    _fitCanvasToNodes() {
-        // Math utils
-        function round_up(x, n) {
-            return Math.ceil(x / n) * n;
-        }
-        function fix_delta(x, n) {
-            if (x < n || x > 3 * n) {
-                const new_pos = (Math.ceil((x % n) / n) + 1) * n;
-                return -(x - new_pos);
-            }
-            return 0;
-        }
-        // Span of all elements
-        const canvasZoom = this.canvasZoom;
-        const bounds = this._boundsForAllNodes();
-        const position = this.cc.position();
-        const parent = this.cc.parent();
-        // Determine amount we need to expand on top/left
-        let xmin_delta = fix_delta(bounds.xmin, 100);
-        let ymin_delta = fix_delta(bounds.ymin, 100);
-        // May need to expand farther to fill viewport
-        xmin_delta = Math.max(xmin_delta, position.left);
-        ymin_delta = Math.max(ymin_delta, position.top);
-        const left = position.left - xmin_delta;
-        const top = position.top - ymin_delta;
-        // Same for width/height
-        let width = round_up(bounds.xmax + 100, 100) + xmin_delta;
-        let height = round_up(bounds.ymax + 100, 100) + ymin_delta;
-        width = Math.max(width, -left + parent.width());
-        height = Math.max(height, -top + parent.height());
-        // Grow the canvas container
-        this.cc.css({
-            left: left / canvasZoom,
-            top: top / canvasZoom,
-            width: width,
-            height: height,
-        });
-        // Move elements back if needed
-        this.cc.children().each(function () {
-            const p = $(this).position();
-            $(this).css("left", (p.left + xmin_delta) / canvasZoom);
-            $(this).css("top", (p.top + ymin_delta) / canvasZoom);
-        });
-    }
-    _boundsForAllNodes() {
-        let xmin = Infinity;
-        let xmax = -Infinity;
-        let ymin = Infinity;
-        let ymax = -Infinity;
-        let p;
-        Object.values(this.app.nodes).forEach((node) => {
-            const e = $(node.element);
-            p = e.position();
-            xmin = Math.min(xmin, p.left);
-            xmax = Math.max(xmax, p.left + e.width());
-            ymin = Math.min(ymin, p.top);
-            ymax = Math.max(ymax, p.top + e.height());
-        });
-        return { xmin: xmin, xmax: xmax, ymin: ymin, ymax: ymax };
-    }
-    scrollToNode(node) {
-        const e = $(node.element);
-        const p = e.position();
-        const cv = $("#canvas-viewport");
-
-        const midX = p.left + e.width() / 2;
-        const midY = p.top + e.height() / 2;
-        const left = midX - cv.width() / 2;
-        const top = midY - cv.height() / 2;
-        this.move(-left, -top);
-        this.highlightInOverlay(node);
-    }
-    scrollToNodes() {
-        const cv = $("#canvas-viewport");
-        const cc = $("#canvas-container");
-        let top = 0;
-        let left = 0;
-        if (cc.width() != cv.width()) {
-            left = (cv.width() - cc.width()) / 2;
-        }
-        if (cc.height() != cv.height()) {
-            top = (cv.height() - cc.height()) / 2;
-        }
-        cc.css({ left: left, top: top });
-    }
-}
-
-// https://stackoverflow.com/a/48129324
-function rgbToHex(r, g, b) {
-    return "#" + ((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1);
-}
-
-function hexToRgb(hex) {
-    var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-    return result
-        ? {
-              r: parseInt(result[1], 16),
-              g: parseInt(result[2], 16),
-              b: parseInt(result[3], 16),
-          }
-        : null;
-}
-
-// returns an array of startColor, colors between according to steps, and endColor
-function getRamp(startColor, endColor, steps) {
-    var ramp = [];
-
-    ramp.push(startColor);
-
-    var startColorRgb = hexToRgb(startColor);
-    var endColorRgb = hexToRgb(endColor);
-
-    var rInc = Math.round((endColorRgb.r - startColorRgb.r) / (steps + 1));
-    var gInc = Math.round((endColorRgb.g - startColorRgb.g) / (steps + 1));
-    var bInc = Math.round((endColorRgb.b - startColorRgb.b) / (steps + 1));
-
-    for (var i = 0; i < steps; i++) {
-        startColorRgb.r += rInc;
-        startColorRgb.g += gInc;
-        startColorRgb.b += bInc;
-
-        ramp.push(rgbToHex(startColorRgb.r, startColorRgb.g, startColorRgb.b));
-    }
-    ramp.push(endColor);
-
-    return ramp;
-}
-
-export default CanvasManager;
diff --git a/client/src/components/Workflow/Editor/modules/collectionTypeDescription.ts b/client/src/components/Workflow/Editor/modules/collectionTypeDescription.ts
new file mode 100644
index 00000000000..f2b4b2afbe5
--- /dev/null
+++ b/client/src/components/Workflow/Editor/modules/collectionTypeDescription.ts
@@ -0,0 +1,130 @@
+/* classes for reasoning about collection map over state
+   null: not a collection?
+   NULL_COLLECTION_TYPE_DESCRIPTION: also not a collection. Is there any difference with null ?
+   ANY_COLLECTION_TYPE_DESCRIPTION: collection, but will never be mapped over (input has no collection_type)
+   CollectionTypeDescription: "normal" collection, with a `collection_type`
+*/
+
+export interface CollectionTypeDescriptor {
+    isCollection: boolean;
+    collectionType: string | null;
+    rank: number;
+    canMatch(other: CollectionTypeDescriptor): boolean;
+    canMapOver(other: CollectionTypeDescriptor): boolean;
+    append(other: CollectionTypeDescriptor): CollectionTypeDescriptor;
+    equal(other: CollectionTypeDescriptor | null): boolean;
+    toString(): string;
+    effectiveMapOver(other: CollectionTypeDescriptor): CollectionTypeDescriptor;
+}
+
+export const NULL_COLLECTION_TYPE_DESCRIPTION: CollectionTypeDescriptor = {
+    isCollection: false,
+    collectionType: null,
+    rank: 0,
+    canMatch: function (other) {
+        return false;
+    },
+    canMapOver: function () {
+        return false;
+    },
+    toString: function () {
+        return "NullCollectionType[]";
+    },
+    append: function (other) {
+        return other;
+    },
+    equal: function (other) {
+        return other === this;
+    },
+    effectiveMapOver: function (other: CollectionTypeDescriptor) {
+        return NULL_COLLECTION_TYPE_DESCRIPTION;
+    },
+};
+
+export const ANY_COLLECTION_TYPE_DESCRIPTION: CollectionTypeDescriptor = {
+    isCollection: true,
+    collectionType: "any",
+    rank: -1,
+    canMatch: function (other) {
+        return NULL_COLLECTION_TYPE_DESCRIPTION !== other;
+    },
+    canMapOver: function () {
+        return false;
+    },
+    toString: function () {
+        return "AnyCollectionType[]";
+    },
+    append: function () {
+        return ANY_COLLECTION_TYPE_DESCRIPTION;
+    },
+    equal: function (other) {
+        return other === this;
+    },
+    effectiveMapOver: function (other: CollectionTypeDescriptor) {
+        return NULL_COLLECTION_TYPE_DESCRIPTION;
+    },
+};
+
+export class CollectionTypeDescription implements CollectionTypeDescriptor {
+    collectionType: string;
+    isCollection: true;
+    rank: number;
+
+    constructor(collectionType: string) {
+        this.collectionType = collectionType;
+        this.isCollection = true;
+        this.rank = collectionType.split(":").length;
+    }
+    append(other: CollectionTypeDescriptor): CollectionTypeDescriptor {
+        if (other === NULL_COLLECTION_TYPE_DESCRIPTION) {
+            return this;
+        }
+        if (other === ANY_COLLECTION_TYPE_DESCRIPTION) {
+            return other;
+        }
+        return new CollectionTypeDescription(`${this.collectionType}:${other.collectionType}`);
+    }
+    canMatch(other: CollectionTypeDescriptor) {
+        if (other === NULL_COLLECTION_TYPE_DESCRIPTION) {
+            return false;
+        }
+        if (other === ANY_COLLECTION_TYPE_DESCRIPTION) {
+            return true;
+        }
+        return other.collectionType == this.collectionType;
+    }
+    canMapOver(other: CollectionTypeDescriptor) {
+        if (!other.collectionType || other.collectionType === "any") {
+            return false;
+        }
+        if (this.rank <= other.rank) {
+            // Cannot map over self...
+            return false;
+        }
+        const requiredSuffix = other.collectionType;
+        return this._endsWith(this.collectionType, requiredSuffix);
+    }
+    effectiveMapOver(other: CollectionTypeDescriptor): CollectionTypeDescriptor {
+        if (other.collectionType && this.canMapOver(other)) {
+            const otherCollectionType = other.collectionType;
+            const effectiveCollectionType = this.collectionType.substring(
+                0,
+                this.collectionType.length - otherCollectionType.length - 1
+            );
+            return new CollectionTypeDescription(effectiveCollectionType);
+        }
+        return NULL_COLLECTION_TYPE_DESCRIPTION;
+    }
+    equal(other: CollectionTypeDescriptor | null) {
+        if (!other) {
+            return false;
+        }
+        return other.collectionType == this.collectionType;
+    }
+    toString() {
+        return `CollectionType[${this.collectionType}]`;
+    }
+    _endsWith(str: string, suffix: string) {
+        return str.indexOf(suffix, str.length - suffix.length) !== -1;
+    }
+}
diff --git a/client/src/components/Workflow/Editor/modules/connector.js b/client/src/components/Workflow/Editor/modules/connector.js
deleted file mode 100644
index 54cd59b8623..00000000000
--- a/client/src/components/Workflow/Editor/modules/connector.js
+++ /dev/null
@@ -1,198 +0,0 @@
-import * as d3 from "d3";
-import { Toast } from "composables/toast";
-
-// Rendering parameters
-const zIndex = 1000;
-const cpFactor = 10;
-const canvasExtra = 100;
-const handleMarginX = 8;
-const ribbonMargin = 4;
-const ribbonInnerSingle = 4;
-const ribbonOuterSingle = 6;
-const ribbonInnerMultiple = 1;
-const ribbonOuterMultiple = 3;
-
-function offset(element) {
-    const rect = element.getBoundingClientRect();
-    return {
-        top: rect.top + window.scrollY,
-        left: rect.left + window.scrollX,
-    };
-}
-
-class Connector {
-    constructor(canvasManager = {}, outputHandle = null, inputHandle = null) {
-        this.manager = canvasManager;
-        this.dragging = false;
-        this.innerClass = "ribbon-inner";
-        this.canvas = document.createElement("div");
-        this.canvas.style.position = "absolute";
-        const container = document.getElementById("canvas-container");
-        container.appendChild(this.canvas);
-        this.svg = d3.select(this.canvas).append("svg");
-        this.svg.attr("class", "ribbon");
-        if (outputHandle && inputHandle) {
-            this.connect(outputHandle, inputHandle);
-        }
-    }
-    connect(t1, t2) {
-        this.outputHandle = t1;
-        this.outputHandle?.connect(this);
-        this.inputHandle = t2;
-        this.inputHandle?.connect(this);
-    }
-    destroy() {
-        this.outputHandle?.disconnect(this);
-        this.inputHandle?.disconnect(this);
-        this.canvas.remove();
-    }
-    destroyIfInvalid(warn) {
-        if (this.outputHandle && this.inputHandle && !this.inputHandle.attachable(this.outputHandle).canAccept) {
-            if (warn) {
-                Toast.warning("Destroying a connection because collection type has changed.");
-            }
-            this.destroy();
-        }
-    }
-    dropStart(canAccept) {
-        if (canAccept) {
-            this.innerClass = "ribbon-inner-valid";
-        } else {
-            this.innerClass = "ribbon-inner-invalid";
-        }
-    }
-    dropEnd() {
-        this.innerClass = "ribbon-inner";
-    }
-    redraw() {
-        // Identify handles
-        const canvasContainer = document.getElementById("canvas-container");
-        const outputHandle = this.outputHandle;
-        const inputHandle = this.inputHandle;
-        if (!canvasContainer || !outputHandle || !inputHandle) {
-            return;
-        }
-        if (this.dragging) {
-            this.canvas.style.zIndex = zIndex;
-        }
-        if (!outputHandle || !inputHandle) {
-            return;
-        }
-        // Set handle ids, used in test cases
-        this.canvas.setAttribute("output-handle-id", outputHandle.element.getAttribute("id"));
-        this.canvas.setAttribute("input-handle-id", inputHandle.element.getAttribute("id"));
-
-        // Find the position of each handle
-        const canvasZoom = this.manager.canvasZoom;
-
-        const relativeLeft = (e) => (offset(e).left - offset(canvasContainer).left) / canvasZoom + handleMarginX;
-        const relativeTop = (e) =>
-            (offset(e).top - offset(canvasContainer).top) / canvasZoom + 0.5 * inputHandle.element.offsetHeight;
-
-        let start_x = relativeLeft(outputHandle.element);
-        let start_y = relativeTop(outputHandle.element);
-        let end_x = relativeLeft(inputHandle.element);
-        let end_y = relativeTop(inputHandle.element);
-
-        // Calculate canvas area
-        const canvas_min_x = Math.min(start_x, end_x);
-        const canvas_max_x = Math.max(start_x, end_x);
-        const canvas_min_y = Math.min(start_y, end_y);
-        const canvas_max_y = Math.max(start_y, end_y);
-        const canvas_left = canvas_min_x - canvasExtra;
-        const canvas_top = canvas_min_y - canvasExtra;
-        const canvas_width = canvas_max_x - canvas_min_x + 2 * canvasExtra;
-        const canvas_height = canvas_max_y - canvas_min_y + 2 * canvasExtra;
-
-        // Place the canvas
-        this.canvas.style.left = `${canvas_left}px`;
-        this.canvas.style.top = `${canvas_top}px`;
-
-        // Resize the svg
-        this.svg.style("width", `${canvas_width}px`);
-        this.svg.style("height", `${canvas_height}px`);
-
-        // Adjust points to be relative to the canvas
-        start_x -= canvas_left;
-        start_y -= canvas_top;
-        end_x -= canvas_left;
-        end_y -= canvas_top;
-
-        // Determine line shift
-        const cp_shift = Math.min(Math.max(Math.abs(canvas_max_y - canvas_min_y) / 2, cpFactor), 3 * cpFactor);
-
-        // Draw ribbons
-        this.drawRibbon(outputHandle, inputHandle, cp_shift, start_x, start_y, end_x, end_y);
-    }
-    drawRibbon(outputHandle, inputHandle, cp_shift, start_x, start_y, end_x, end_y) {
-        // Check ribbon type
-        const startRibbon = outputHandle && outputHandle.isMappedOver();
-        const endRibbon = inputHandle && inputHandle.isMappedOver();
-
-        // Draw the line
-        let start_offsets = [0];
-        let end_offsets = [0];
-        const offsets = [-2 * ribbonMargin, -ribbonMargin, 0, ribbonMargin, 2 * ribbonMargin];
-        let num_offsets = 1;
-        if (startRibbon) {
-            start_offsets = offsets;
-            num_offsets = offsets.length;
-        }
-        if (endRibbon) {
-            end_offsets = offsets;
-            num_offsets = offsets.length;
-        }
-        this.svg.selectAll("*").remove();
-        for (let i = 0; i < num_offsets; i++) {
-            let inner_width = ribbonInnerSingle;
-            let outer_width = ribbonOuterSingle;
-            if (start_offsets.length > 1 || end_offsets.length > 1) {
-                inner_width = ribbonInnerMultiple;
-                outer_width = ribbonOuterMultiple;
-            }
-            this.drawCurve(
-                start_x,
-                start_y,
-                end_x,
-                end_y,
-                cp_shift,
-                inner_width,
-                outer_width,
-                start_offsets[i % start_offsets.length],
-                end_offsets[i % end_offsets.length]
-            );
-        }
-    }
-    drawCurve(start_x, start_y, end_x, end_y, cp_shift, inner_width, outer_width, offset_start, offset_end) {
-        offset_start = offset_start || 0;
-        offset_end = offset_end || 0;
-        const lineData = [
-            { x: start_x, y: start_y + offset_start },
-            { x: start_x + cp_shift, y: start_y + offset_start },
-            { x: end_x - cp_shift, y: end_y + offset_end },
-            { x: end_x, y: end_y + offset_end },
-        ];
-        const lineFunction = d3.svg
-            .line()
-            .x(function (d) {
-                return d.x;
-            })
-            .y(function (d) {
-                return d.y;
-            })
-            .interpolate("basis");
-        this.svg
-            .append("path")
-            .attr("class", "ribbon-outer")
-            .attr("d", lineFunction(lineData))
-            .attr("stroke-width", outer_width)
-            .attr("fill", "none");
-        this.svg
-            .append("path")
-            .attr("class", this.innerClass)
-            .attr("d", lineFunction(lineData))
-            .attr("stroke-width", inner_width)
-            .attr("fill", "none");
-    }
-}
-export default Connector;
diff --git a/client/src/components/Workflow/Editor/modules/dragging.js b/client/src/components/Workflow/Editor/modules/dragging.js
deleted file mode 100644
index 6c5839542a4..00000000000
--- a/client/src/components/Workflow/Editor/modules/dragging.js
+++ /dev/null
@@ -1,138 +0,0 @@
-import $ from "jquery";
-import Terminals from "./terminals";
-import Connector from "./connector";
-import { ariaSelectOutputNode } from "./aria";
-
-export function attachDragging(el, callbacks) {
-    const $el = $(el);
-    Object.entries(callbacks).forEach(([k, v]) => {
-        $el.bind(k, v);
-    });
-}
-
-export class InputDragging {
-    constructor(app, options = {}) {
-        this.app = app;
-        this.el = options.el;
-        this.terminal = options.terminal;
-        this.el.terminal = this.terminal;
-        this.$el = $(this.el);
-        this.$el.on("dropinit", (e, d) => this.onDropInit(e, d));
-        this.$el.on("dropstart", (e, d) => this.onDropStart(e, d));
-        this.$el.on("dropend", (e, d) => this.onDropEnd(e, d));
-        this.$el.on("drop", (e, d) => this.onDrop(e, d));
-    }
-    onDropInit(e, d = {}) {
-        var terminal = this.terminal;
-        // Accept a dragable if it is an output terminal and has a
-        // compatible type
-        var connectionAcceptable = $(d.drag).hasClass("output-terminal") && terminal.canAccept(d.drag.terminal);
-        if (connectionAcceptable.canAccept) {
-            this.$el.addClass("can-accept");
-            this.$el.removeClass("cannot-accept");
-            this.reason = null;
-        } else {
-            this.$el.addClass("cannot-accept");
-            this.$el.removeClass("can-accept");
-            this.reason = connectionAcceptable.reason;
-        }
-        return true;
-    }
-    onDropStart(e, d = {}) {
-        if (d.proxy.terminal) {
-            if (this.$el.hasClass("can-accept")) {
-                d.proxy.terminal.connectors[0].dropStart(true);
-                d.proxy.dropTooltip = "";
-            } else {
-                d.proxy.terminal.connectors[0].dropStart(false);
-                if (this.reason) {
-                    d.proxy.dropTooltip = this.reason;
-                    $(d.proxy).tooltip("show");
-                } else {
-                    d.proxy.dropTooltip = "";
-                }
-            }
-        }
-    }
-    onDropEnd(e, d = {}) {
-        d.proxy.dropTooltip = "";
-        if (d.proxy.terminal) {
-            d.proxy.terminal.connectors[0].dropEnd();
-        }
-    }
-    onDrop(e, d = {}) {
-        d.proxy.dropTooltip = "";
-        if (this.$el.hasClass("can-accept")) {
-            const terminal = this.terminal;
-            const c = new Connector(this.app.canvasManager, d.drag.terminal, terminal);
-            c.redraw();
-        }
-    }
-}
-
-export class OutputDragging {
-    constructor(app, options) {
-        this.app = app;
-        this.el = options.el;
-        this.terminal = options.terminal;
-        this.el.terminal = this.terminal;
-        this.$el = $(this.el);
-        this.$el.attr(
-            "aria-label",
-            `connect output ${this.terminal.name} to input. Press space to see a list of available inputs`
-        );
-        this.$el.attr("tabindex", "0");
-        this.$el.attr("aria-grabbed", "false");
-        this.$el.on("drag", (e, d) => this.onDrag(e, d));
-        this.$el.on("dragstart", (e, d) => this.onDragStart(e, d));
-        this.$el.on("dragend", (e, d) => this.onDragEnd(e, d));
-        this.$el.on("keydown", (e) =>
-            ariaSelectOutputNode({
-                e: e,
-                manager: app,
-                outputTerminal: options.terminal,
-                outputEl: this.el,
-            })
-        );
-    }
-    onDrag(e, d = {}) {
-        var onmove = () => {
-            var canvasZoom = this.app.canvasManager.canvasZoom;
-            var po = $(d.proxy).offsetParent().offset();
-            var x = d.offsetX - po.left;
-            var y = d.offsetY - po.top;
-            $(d.proxy).css({ left: x / canvasZoom, top: y / canvasZoom });
-            d.proxy.terminal.redraw();
-            this.app.canvasManager.updateViewportOverlay();
-        };
-        onmove();
-        this.app.canvasManager.scrollPanel.test(e, onmove);
-    }
-    onDragStart(e, d = {}) {
-        $(d.available).addClass("input-terminal-active");
-        // Drag proxy div
-        var h = $("<div class='drag-terminal'/>").appendTo("#canvas-container").get(0);
-        h.dropTooltip = "";
-        // Terminal and connection to display noodle while dragging
-        $(h).tooltip({
-            title: function () {
-                return h.dropTooltip || "";
-            },
-        });
-        h.terminal = new Terminals.Terminal({ element: h, node: {} });
-        const c = new Connector(this.app.canvasManager);
-        c.dragging = true;
-        c.connect(this.terminal, h.terminal);
-        return h;
-    }
-    onDragEnd(e, d = {}) {
-        var connector = d.proxy.terminal.connectors[0];
-        if (connector) {
-            connector.destroy();
-        }
-        $(d.proxy).tooltip("dispose");
-        $(d.proxy).remove();
-        $(d.available).removeClass("input-terminal-active");
-        this.app.canvasManager.scrollPanel.stop();
-    }
-}
diff --git a/client/src/components/Workflow/Editor/modules/layout.js b/client/src/components/Workflow/Editor/modules/layout.js
deleted file mode 100644
index eb31a36880d..00000000000
--- a/client/src/components/Workflow/Editor/modules/layout.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import $ from "jquery";
-import ELK from "elkjs/lib/elk.bundled.js";
-const elk = new ELK();
-
-export function autoLayout(workflow) {
-    workflow.hasChanges = true;
-
-    // Convert this to ELK compat.
-    var newgraph = {
-        id: "",
-        layoutOptions: {
-            "elk.algorithm": "layered",
-            "crossingMinimization.semiInteractive": true,
-            "nodePlacement.strategy": "NETWORK_SIMPLEX",
-        },
-        children: [],
-        edges: [],
-    };
-
-    newgraph.children = Object.values(workflow.nodes).map((node) => {
-        var inputs = Object.keys(node.inputTerminals).map((t, idx) => {
-            return {
-                id: `${node._uid}/in/${t}`,
-                properties: {
-                    "port.side": "WEST",
-                    "port.index": idx,
-                },
-            };
-        });
-
-        var outputs = Object.keys(node.outputTerminals).map((t, idx) => {
-            return {
-                id: `${node._uid}/out/${t}`,
-                properties: {
-                    "port.side": "EAST",
-                    "port.index": idx,
-                },
-            };
-        });
-
-        return {
-            id: node._uid,
-            height: $(node.element).height() + 20,
-            width: $(node.element).width() + 60,
-            ports: inputs.concat(outputs),
-        };
-    });
-
-    Object.values(workflow.nodes).forEach((node) => {
-        Object.values(node.inputTerminals).forEach((t) => {
-            t.connectors.forEach((c) => {
-                newgraph.edges.push({
-                    id: `e_${node._uid}_${c.outputHandle.node._uid}`,
-                    sources: [`${c.outputHandle.node._uid}/out/${c.outputHandle.name}`],
-                    targets: [`${c.inputHandle.node._uid}/in/${c.inputHandle.name}`],
-                });
-            });
-        });
-    });
-
-    elk.layout(newgraph)
-        .then((x) => {
-            // Reapply positions to galaxy graph from our relayed out graph.
-            x.children.forEach((q) => {
-                var node = Object.values(workflow.nodes).filter((x) => {
-                    return x._uid === q.id;
-                })[0];
-                const element = $(node.element);
-                $(element).css({ top: q.y, left: q.x });
-            });
-
-            Object.values(workflow.nodes).forEach((node) => {
-                node.onRedraw();
-            });
-        })
-        .catch(console.error);
-}
diff --git a/client/src/components/Workflow/Editor/modules/layout.ts b/client/src/components/Workflow/Editor/modules/layout.ts
new file mode 100644
index 00000000000..9c2e5832cee
--- /dev/null
+++ b/client/src/components/Workflow/Editor/modules/layout.ts
@@ -0,0 +1,99 @@
+import ELK from "elkjs/lib/elk.bundled.js";
+import { useWorkflowStateStore } from "@/stores/workflowEditorStateStore";
+import type { Step } from "@/stores/workflowStepStore";
+import { useConnectionStore } from "@/stores/workflowConnectionStore";
+
+const elk = new ELK();
+
+interface GraphChild {
+    id: string;
+    height: number;
+    width: number;
+    ports: {
+        id: string;
+        properties: {
+            "port.side": string;
+            "port.index": number;
+        };
+    }[];
+}
+
+interface GraphEdge {
+    id: string;
+    sources: string[];
+    targets: string[];
+}
+
+interface NewGraph {
+    id: string;
+    layoutOptions: { [index: string]: string };
+    children: GraphChild[];
+    edges: GraphEdge[];
+}
+
+export async function autoLayout(steps: { [index: string]: Step }) {
+    const stateStore = useWorkflowStateStore();
+    const connectionStore = useConnectionStore();
+
+    // Convert this to ELK compat.
+    const newGraph: NewGraph = {
+        id: "",
+        layoutOptions: {
+            "elk.algorithm": "layered",
+            "crossingMinimization.semiInteractive": "true",
+            "nodePlacement.strategy": "NETWORK_SIMPLEX",
+        },
+        children: [],
+        edges: [],
+    };
+
+    newGraph.children = Object.entries(steps).map(([stepId, step]) => {
+        const inputs = Object.values(step.inputs).map((input) => {
+            return {
+                id: `${stepId}/in/${input.name}`,
+                properties: {
+                    "port.side": "WEST",
+                    "port.index": step.id,
+                },
+            };
+        });
+
+        const outputs = Object.values(step.outputs).map((output) => {
+            return {
+                id: `${stepId}/out/${output.name}`,
+                properties: {
+                    "port.side": "EAST",
+                    "port.index": step.id,
+                },
+            };
+        });
+        const position = stateStore.stepPosition[step.id];
+        return {
+            id: stepId,
+            height: position.height + 20,
+            width: position.width + 60,
+            ports: inputs.concat(outputs),
+        };
+    });
+
+    newGraph.edges = connectionStore.connections.map((connection) => {
+        const edge: GraphEdge = {
+            id: `e_${connection.input.stepId}_${connection.output.stepId}`,
+            sources: [`${connection.output.stepId}/out/${connection.output.name}`],
+            targets: [`${connection.input.stepId}/in/${connection.input.name}`],
+        };
+        return edge;
+    });
+
+    try {
+        const elkNode = await elk.layout(newGraph);
+        // Reapply positions to galaxy graph from our relayed out graph.
+        const newSteps = elkNode.children?.map((q) => {
+            const newStep = { ...steps[q.id], position: { top: q.y, left: q.x } };
+            return newStep;
+        });
+        return newSteps;
+    } catch (error) {
+        console.error(error);
+    }
+}
diff --git a/client/src/components/Workflow/Editor/modules/linting.js b/client/src/components/Workflow/Editor/modules/linting.js
deleted file mode 100644
index d1ebb928a27..00000000000
--- a/client/src/components/Workflow/Editor/modules/linting.js
+++ /dev/null
@@ -1,125 +0,0 @@
-export function getDisconnectedInputs(nodes) {
-    const inputs = [];
-    Object.values(nodes).forEach((node) => {
-        Object.entries(node.inputTerminals).forEach(([inputName, inputTerminal]) => {
-            if (!(inputTerminal.connectors && inputTerminal.connectors.length > 0) && !inputTerminal.optional) {
-                const inputLabel = inputTerminal.attributes.input.label;
-                inputs.push({
-                    stepId: node.id,
-                    stepLabel: node.title, // label but falls back to tool title...
-                    warningLabel: inputLabel,
-                    inputName: inputName,
-                    autofix: !inputTerminal.multiple,
-                });
-            }
-        });
-    });
-    return inputs;
-}
-
-export function getMissingMetadata(nodes) {
-    const inputs = [];
-    Object.values(nodes).forEach((node) => {
-        if (node.isInput) {
-            const noAnnotation = !node.annotation;
-            const noLabel = !node.label;
-            let warningLabel = null;
-            if (noLabel && noAnnotation) {
-                warningLabel = "Missing a label and annotation";
-            } else if (noLabel) {
-                warningLabel = "Missing a label";
-            } else if (noAnnotation) {
-                warningLabel = "Missing an annotation";
-            }
-            if (warningLabel) {
-                inputs.push({
-                    stepId: node.id,
-                    stepLabel: node.title,
-                    warningLabel: warningLabel,
-                });
-            }
-        }
-    });
-    return inputs;
-}
-
-export function getUnlabeledOutputs(nodes) {
-    const outputs = [];
-    Object.values(nodes).forEach((node) => {
-        if (node.isInput) {
-            // For now skip these... maybe should push this logic into linting though
-            // since it is fine to have outputs on inputs.
-            return;
-        }
-        const activeOutputs = node.activeOutputs;
-        for (const outputDef of activeOutputs.getAll()) {
-            if (!outputDef.label) {
-                outputs.push({
-                    stepId: node.id,
-                    stepLabel: node.title, // label but falls back to tool title...
-                    warningLabel: outputDef.output_name,
-                    autofix: true,
-                });
-            }
-        }
-    });
-    return outputs;
-}
-
-export function getUntypedParameters(untypedParameters) {
-    const items = [];
-    if (untypedParameters) {
-        untypedParameters.parameters.forEach((parameter) => {
-            items.push({
-                stepId: parameter.references[0].nodeId,
-                stepLabel: parameter.references[0].toolInput.label,
-                warningLabel: parameter.name,
-                name: parameter.name,
-                autofix: parameter.canExtract(),
-            });
-        });
-    }
-    return items;
-}
-
-export function fixAllIssues(nodes, parameters) {
-    const actions = [];
-    const untypedParameters = getUntypedParameters(parameters);
-    for (const untypedParameter of untypedParameters) {
-        if (untypedParameter.autofix) {
-            actions.push(fixUntypedParameter(untypedParameter));
-        }
-    }
-    const disconnectedInputs = getDisconnectedInputs(nodes);
-    for (const disconnectedInput of disconnectedInputs) {
-        if (disconnectedInput.autofix) {
-            actions.push(fixDisconnectedInput(disconnectedInput));
-        }
-    }
-    const unlabeledOutputs = getUnlabeledOutputs(nodes);
-    if (unlabeledOutputs.length > 0) {
-        actions.push(fixUnlabeledOutputs());
-    }
-    return actions;
-}
-
-export function fixUntypedParameter(untypedParameter) {
-    return {
-        action_type: "extract_untyped_parameter",
-        name: untypedParameter.name,
-    };
-}
-
-export function fixDisconnectedInput(disconnectedInput) {
-    return {
-        action_type: "extract_input",
-        input: {
-            order_index: parseInt(disconnectedInput.stepId),
-            input_name: disconnectedInput.inputName,
-        },
-    };
-}
-
-export function fixUnlabeledOutputs() {
-    return { action_type: "remove_unlabeled_workflow_outputs" };
-}
diff --git a/client/src/components/Workflow/Editor/modules/linting.ts b/client/src/components/Workflow/Editor/modules/linting.ts
new file mode 100644
index 00000000000..c59217561a5
--- /dev/null
+++ b/client/src/components/Workflow/Editor/modules/linting.ts
@@ -0,0 +1,148 @@
+import { terminalFactory } from "./terminals";
+import type { Step, Steps } from "@/stores/workflowStepStore";
+import type { DatatypesMapperModel } from "@/components/Datatypes/model";
+import type { UntypedParameters } from "@/components/Workflow/Editor/modules/parameters";
+
+interface LintState {
+    stepId: number;
+    stepLabel: string;
+    warningLabel: string;
+    name?: string;
+    inputName?: string;
+    autofix?: boolean;
+}
+
+export function getDisconnectedInputs(steps: Steps = {}, datatypesMapper: DatatypesMapperModel) {
+    const inputs: LintState[] = [];
+    Object.values(steps).forEach((step) => {
+        step.inputs.map((inputSource) => {
+            const inputTerminal = terminalFactory(step.id, inputSource, datatypesMapper);
+            if (!inputTerminal.optional && inputTerminal.connections.length === 0) {
+                const inputLabel = inputSource.label || inputSource.name;
+                inputs.push({
+                    stepId: step.id,
+                    stepLabel: step.label || step.content_id || step.name,
+                    warningLabel: inputLabel,
+                    inputName: inputSource.name,
+                    autofix: !inputTerminal.multiple,
+                });
+            }
+        });
+    });
+    return inputs;
+}
+
+function isInput(stepType: Step["type"]) {
+    return stepType == "data_input" || stepType == "data_collection_input" || stepType == "parameter_input";
+}
+
+export function getMissingMetadata(steps: Steps) {
+    const inputs: LintState[] = [];
+    Object.values(steps).forEach((step) => {
+        if (isInput(step.type)) {
+            const noAnnotation = !step.annotation;
+            const noLabel = !step.label;
+            let warningLabel = null;
+            if (noLabel && noAnnotation) {
+                warningLabel = "Missing a label and annotation";
+            } else if (noLabel) {
+                warningLabel = "Missing a label";
+            } else if (noAnnotation) {
+                warningLabel = "Missing an annotation";
+            }
+            if (warningLabel) {
+                inputs.push({
+                    stepId: step.id,
+                    stepLabel: step.label || step.content_id || step.name,
+                    warningLabel: warningLabel,
+                });
+            }
+        }
+    });
+    return inputs;
+}
+
+export function getUnlabeledOutputs(steps: Steps) {
+    const outputs: LintState[] = [];
+    Object.values(steps).forEach((step) => {
+        if (isInput(step.type)) {
+            // For now skip these... maybe should push this logic into linting though
+            // since it is fine to have outputs on inputs.
+            return;
+        }
+
+        const workflowOutputs = step.workflow_outputs || [];
+        for (const workflowOutput of workflowOutputs) {
+            if (!workflowOutput.label) {
+                outputs.push({
+                    stepId: step.id,
+                    stepLabel: step.label || step.content_id || step.name,
+                    warningLabel: workflowOutput.output_name,
+                    autofix: true,
+                });
+            }
+        }
+    });
+    return outputs;
+}
+
+export function getUntypedParameters(untypedParameters: UntypedParameters) {
+    const items: LintState[] = [];
+    if (untypedParameters) {
+        untypedParameters.parameters.forEach((parameter) => {
+            const parameterReference = parameter.references[0];
+            // TODO: Not sure this is right, but I think this may have been broken previously?
+            const stepLabel = "toolInput" in parameterReference ? parameterReference.toolInput.label : parameter.name;
+            items.push({
+                stepId: parameterReference.stepId,
+                stepLabel: stepLabel,
+                warningLabel: parameter.name,
+                name: parameter.name,
+                autofix: parameter.canExtract(),
+            });
+        });
+    }
+    return items;
+}
+
+export function fixAllIssues(steps: Steps, parameters: UntypedParameters, datatypesMapper: DatatypesMapperModel) {
+    const actions = [];
+    const untypedParameters = getUntypedParameters(parameters);
+    for (const untypedParameter of untypedParameters) {
+        if (untypedParameter.autofix) {
+            actions.push(fixUntypedParameter(untypedParameter));
+        }
+    }
+    const disconnectedInputs = getDisconnectedInputs(steps, datatypesMapper);
+    for (const disconnectedInput of disconnectedInputs) {
+        if (disconnectedInput.autofix) {
+            actions.push(fixDisconnectedInput(disconnectedInput));
+        }
+    }
+    const unlabeledOutputs = getUnlabeledOutputs(steps);
+    if (unlabeledOutputs.length > 0) {
+        actions.push(fixUnlabeledOutputs());
+    }
+    return actions;
+}
+
+export function fixUntypedParameter(untypedParameter: LintState) {
+    return {
+        action_type: "extract_untyped_parameter",
+        name: untypedParameter.name,
+    };
+}
+
+export function fixDisconnectedInput(disconnectedInput: LintState) {
+    return {
+        action_type: "extract_input",
+        input: {
+            order_index: disconnectedInput.stepId,
+            input_name: disconnectedInput.inputName,
+        },
+    };
+}
+
+export function fixUnlabeledOutputs() {
+    return { action_type: "remove_unlabeled_workflow_outputs" };
+}
diff --git a/client/src/components/Workflow/Editor/modules/model.js b/client/src/components/Workflow/Editor/modules/model.js
deleted file mode 100644
index 4af88be1002..00000000000
--- a/client/src/components/Workflow/Editor/modules/model.js
+++ /dev/null
@@ -1,188 +0,0 @@
-import Connector from "./connector";
-import Vue from "vue";
-
-export async function fromSimple(workflow, data, appendData = false) {
-    let offset = 0;
-    if (appendData) {
-        offset = workflow.nodeIndex;
-    } else {
-        workflow.nodeIndex = 0;
-        workflow.name = data.name;
-        workflow.annotation = data.annotation;
-        workflow.license = data.license;
-        workflow.creator = data.creator;
-        Object.values(workflow.nodes).forEach((node) => {
-            node.onRemove();
-        });
-    }
-    await Vue.nextTick();
-    workflow.version = data.version;
-    workflow.report = data.report || {};
-    Object.values(data.steps).forEach((step) => {
-        // If workflow being copied into another, wipe UUID and let
-        // Galaxy assign new ones.
-        if (appendData) {
-            step.uuid = null;
-        }
-        Vue.set(workflow.steps, workflow.nodeIndex++, {
-            ...step,
-        });
-    });
-    await Vue.nextTick();
-    // Second pass, connections
-    let using_workflow_outputs = false;
-    Object.entries(data.steps).forEach(([id, step]) => {
-        if (step.workflow_outputs && step.workflow_outputs.length > 0) {
-            using_workflow_outputs = true;
-        }
-    });
-
-    Object.entries(data.steps).forEach(([id, step]) => {
-        const nodeIndex = parseInt(id) + offset;
-        const node = workflow.nodes[nodeIndex];
-        Object.entries(step.input_connections).forEach(([k, v]) => {
-            if (v) {
-                if (!Array.isArray(v)) {
-                    v = [v];
-                }
-                v.forEach((x) => {
-                    const otherNodeIndex = parseInt(x.id) + offset;
-                    const otherNode = workflow.nodes[otherNodeIndex];
-                    const c = new Connector(workflow.canvasManager);
-                    c.connect(otherNode.outputTerminals[x.output_name], node.inputTerminals[k]);
-                    c.redraw();
-                });
-            }
-        });
-
-        if (!using_workflow_outputs) {
-            // Older workflows contain HideDatasetActions only, but no active outputs yet.
-            Object.values(node.outputs).forEach((ot) => {
-                if (!node.postJobActions[`HideDatasetAction${ot.name}`]) {
-                    node.activeOutputs.add(ot.name);
-                }
-            });
-        }
-    });
-}
-
-export function toSimple(workflow) {
-    const nodes = {};
-    const canvasZoom = workflow.canvasManager.canvasZoom;
-    _rectifyOutputs(workflow);
-    Object.values(workflow.nodes).forEach((node) => {
-        const input_connections = {};
-        Object.values(node.inputTerminals).forEach((t) => {
-            input_connections[t.name] = null;
-            // There should only be 0 or 1 connectors, so this is
-            // really a sneaky if statement
-            const cons = [];
-            t.connectors.forEach((c, i) => {
-                if (c.outputHandle) {
-                    const con_dict = {
-                        id: c.outputHandle.node.id,
-                        output_name: c.outputHandle.name,
-                    };
-                    const input_subworkflow_step_id = t.attributes.input.input_subworkflow_step_id;
-                    if (input_subworkflow_step_id !== undefined) {
-                        con_dict.input_subworkflow_step_id = input_subworkflow_step_id;
-                    }
-                    cons[i] = con_dict;
-                    input_connections[t.name] = cons;
-                }
-            });
-        });
-        const postJobActions = {};
-        if (node.postJobActions) {
-            Object.values(node.postJobActions).forEach((act) => {
-                const pja = {
-                    action_type: act.action_type,
-                    output_name: act.output_name,
-                    action_arguments: act.action_arguments,
-                };
-                postJobActions[act.action_type + act.output_name] = null;
-                postJobActions[act.action_type + act.output_name] = pja;
-            });
-        }
-        const node_data = {
-            id: node.id,
-            type: node.type,
-            content_id: node.content_id,
-            tool_version: node.config_form ? node.config_form.version : null,
-            tool_state: node.tool_state,
-            errors: node.errors,
-            input_connections: input_connections,
-            position: _scaledNodePosition(node.element, canvasZoom),
-            annotation: node.annotation,
-            post_job_actions: node.postJobActions,
-            uuid: node.uuid,
-            label: node.label,
-            workflow_outputs: node.activeOutputs.getAll(),
-        };
-        nodes[node.id] = node_data;
-    });
-    const report = workflow.report;
-    const license = workflow.license;
-    const creator = workflow.creator;
-    const annotation = workflow.annotation;
-    const name = workflow.name;
-    return { steps: nodes, report, license, creator, annotation, name };
-}
-
-function _scaledNodePosition(element, canvasZoom) {
-    const rect = element.getBoundingClientRect();
-    const coords = {
-        left: rect.left / canvasZoom,
-        top: rect.top / canvasZoom,
-    };
-    return coords;
-}
-
-function _rectifyOutputs(workflow) {
-    // Find out if we're using workflow_outputs or not.
-    let using_workflow_outputs = false;
-    let has_existing_pjas = false;
-    Object.values(workflow.nodes).forEach((node) => {
-        if (node.activeOutputs.count() > 0) {
-            using_workflow_outputs = true;
-        }
-        Object.values(node.postJobActions).forEach((pja) => {
-            if (pja.action_type === "HideDatasetAction") {
-                has_existing_pjas = true;
-            }
-        });
-    });
-    if (using_workflow_outputs !== false || has_existing_pjas !== false) {
-        // Using workflow outputs, or has existing pjas.  Remove all PJAs and recreate based on outputs.
-        Object.values(workflow.nodes).forEach((node) => {
-            if (node.postJobActions === null) {
-                node.postJobActions = {};
-            }
-            const pjas_to_rem = [];
-            Object.entries(node.postJobActions).forEach(([pja_id, pja]) => {
-                if (pja.action_type == "HideDatasetAction") {
-                    pjas_to_rem.push(pja_id);
-                }
-            });
-            if (pjas_to_rem.length > 0) {
-                pjas_to_rem.forEach((pja_name) => {
-                    delete node.postJobActions[pja_name];
-                });
-            }
-            if (using_workflow_outputs) {
-                Object.values(node.outputs).forEach((ot) => {
-                    const create_pja = !node.activeOutputs.exists(ot.name);
-                    if (create_pja === true) {
-                        const pja = {
-                            action_type: "HideDatasetAction",
-                            output_name: ot.name,
-                            action_arguments: {},
-                        };
-                        node.postJobActions[`HideDatasetAction${ot.name}`] = null;
-                        node.postJobActions[`HideDatasetAction${ot.name}`] = pja;
-                    }
-                });
-            }
-        });
-    }
-}
diff --git a/client/src/components/Workflow/Editor/modules/model.ts b/client/src/components/Workflow/Editor/modules/model.ts
new file mode 100644
index 00000000000..03c9b6982c7
--- /dev/null
+++ b/client/src/components/Workflow/Editor/modules/model.ts
@@ -0,0 +1,55 @@
+import { useWorkflowStepStore, type Steps, type ConnectionOutputLink } from "@/stores/workflowStepStore";
+
+interface Workflow {
+    name: string;
+    annotation: string;
+    license: string;
+    creator: any;
+    version: number;
+    report: any;
+    steps: Steps;
+}
+
+export async function fromSimple(data: Workflow, appendData = false, defaultPosition = { top: 0, left: 0 }) {
+    const stepStore = useWorkflowStepStore();
+    const stepIdOffset = stepStore.getStepIndex + 1;
+    Object.values(data.steps).forEach((step) => {
+        // If workflow being copied into another, wipe UUID and let
+        // Galaxy assign new ones.
+        if (appendData) {
+            delete step.uuid;
+            if (!step.position) {
+                // Should only happen for manually authored editor content,
+                // good enough for a first pass IMO.
+                step.position = { top: step.id * 100, left: step.id * 100 };
+            }
+            step.id += stepIdOffset;
+            step.position.left += defaultPosition.left;
+            step.position.top += defaultPosition.top;
+            Object.values(step.input_connections).forEach((link) => {
+                let linkArray: ConnectionOutputLink[];
+                if (!Array.isArray(link)) {
+                    linkArray = [link];
+                } else {
+                    linkArray = link;
+                }
+                linkArray.forEach((link) => {
+                    link.id += stepIdOffset;
+                });
+            });
+        }
+    });
+    Object.values(data.steps).map((step) => {
+        stepStore.addStep(step);
+    });
+}
+
+export function toSimple(workflow: Workflow) {
+    const steps = workflow.steps;
+    const report = workflow.report;
+    const license = workflow.license;
+    const creator = workflow.creator;
+    const annotation = workflow.annotation;
+    const name = workflow.name;
+    return { steps, report, license, creator, annotation, name };
+}
diff --git a/client/src/components/Workflow/Editor/modules/outputs.js b/client/src/components/Workflow/Editor/modules/outputs.js
deleted file mode 100644
index 86e140c4be6..00000000000
--- a/client/src/components/Workflow/Editor/modules/outputs.js
+++ /dev/null
@@ -1,136 +0,0 @@
-import Vue from "vue";
-
-export const allLabels = {};
-
-export class ActiveOutputs {
-    constructor() {
-        this.entries = {};
-    }
-
-    /** Initialize list of active outputs from server response */
-    initialize(outputs, incoming) {
-        this.outputs = outputs;
-        this._refreshIndex();
-        incoming &&
-            incoming.forEach((entry) => {
-                if (entry.label && allLabels[entry.label]) {
-                    entry.label = null;
-                }
-                this.add(entry.output_name, entry.label);
-                if (entry.label) {
-                    allLabels[entry.label] = true;
-                }
-            });
-    }
-
-    /** Adds a new record to the value stack **/
-    add(name, label) {
-        if (!this.exists(name)) {
-            this.update(name, label);
-            return true;
-        }
-        return false;
-    }
-
-    /** Toggle an entry */
-    toggle(name) {
-        if (this.exists(name)) {
-            this.remove(name);
-        } else {
-            this.add(name);
-        }
-    }
-
-    /** Change label for an output */
-    labelOutput(outputName, newLabel) {
-        const activeOutput = this.get(outputName);
-        const oldLabel = activeOutput && activeOutput.label;
-        if (newLabel == oldLabel) {
-            return true;
-        }
-        if (this.outputsIndex[outputName] && !allLabels[newLabel]) {
-            const oldLabel = this.update(outputName, newLabel);
-            if (oldLabel && allLabels[oldLabel]) {
-                delete allLabels[oldLabel];
-            }
-            if (newLabel) {
-                allLabels[newLabel] = true;
-            }
-            return true;
-        }
-        return false;
-    }
-
-    /** Returns the number of added records **/
-    count() {
-        return Object.keys(this.entries).length;
-    }
-
-    /**  Return label */
-    get(name) {
-        return this.entries[name];
-    }
-
-    /** Returns true if a record is available for a given key **/
-    exists(name) {
-        return !!this.entries[name];
-    }
-
-    /** Remove an entry given its name */
-    remove(name) {
-        const activeOutput = this.get(name);
-        const activeLabel = activeOutput && activeOutput.label;
-        if (activeLabel && allLabels[activeLabel]) {
-            delete allLabels[activeLabel];
-        }
-        delete this.entries[name];
-        this._updateOutput(name);
-    }
-
-    /** Returns list of all values */
-    getAll() {
-        return Object.values(this.entries);
-    }
-
-    /** Update an active outputs label */
-    update(name, label) {
-        const activeOutput = this.get(name);
-        const oldLabel = activeOutput && activeOutput.label;
-        this.entries[name] = {
-            output_name: name,
-            label: label || null,
-        };
-        this._updateOutput(name);
-        return oldLabel;
-    }
-
-    /** Removes all entries which are not in the parsed dictionary of names */
-    filterOutputs(names) {
-        this.getAll().forEach((wf_output) => {
-            if (!names.includes(wf_output.output_name)) {
-                this.remove(wf_output.output_name);
-            }
-        });
-        this._refreshIndex();
-    }
-
-    /** Update an output */
-    _updateOutput(name) {
-        const output = this.outputsIndex[name];
-        if (output) {
-            const activeOutput = this.get(output.name);
-            Vue.set(output, "activeOutput", !!activeOutput);
-            Vue.set(output, "activeLabel", activeOutput && activeOutput.label);
-        }
-    }
-
-    /** Refreshes dictionary of outputs */
-    _refreshIndex() {
-        this.outputsIndex = {};
-        this.outputs &&
-            this.outputs.forEach((o) => {
-                this.outputsIndex[o.name] = o;
-                this._updateOutput(o.name);
-            });
-    }
-}
diff --git a/client/src/components/Workflow/Editor/modules/outputs.test.js b/client/src/components/Workflow/Editor/modules/outputs.test.js
deleted file mode 100644
index d5ec5cc4ce7..00000000000
--- a/client/src/components/Workflow/Editor/modules/outputs.test.js
+++ /dev/null
@@ -1,69 +0,0 @@
-import { allLabels, ActiveOutputs } from "./outputs";
-
-describe("Workflow Outputs", () => {
-    it("test output label handling", () => {
-        // Test adding initial node
-        const activeOutputs = new ActiveOutputs();
-        const outputs = [{ name: "output_0" }, { name: "output_1" }, { name: "output_2" }];
-        const incoming = [
-            { output_name: "output_0", label: "label_0" },
-            { output_name: "output_1", label: "label_0" },
-            { output_name: "output_2", label: "label_1" },
-        ];
-        activeOutputs.initialize(outputs, incoming);
-        expect(Object.keys(allLabels).length).toBe(2);
-        expect(allLabels["label_0"]).toBe(true);
-        expect(allLabels["label_1"]).toBe(true);
-        expect(activeOutputs.count()).toBe(3);
-        expect(activeOutputs.entries["output_0"].label).toBe("label_0");
-        expect(activeOutputs.entries["output_1"].label).toBe(null);
-        expect(activeOutputs.entries["output_2"].label).toBe("label_1");
-
-        // Test adding additional node
-        const activeOutputs_1 = new ActiveOutputs();
-        const outputs_1 = [{ name: "output_0" }, { name: "output_1" }, { name: "output_2" }];
-        const incoming_1 = [
-            { output_name: "output_0", label: "label_0" },
-            { output_name: "output_1", label: "label_0" },
-            { output_name: "output_2", label: "label_2" },
-        ];
-        activeOutputs_1.initialize(outputs_1, incoming_1);
-        expect(Object.keys(allLabels).length).toBe(3);
-        expect(allLabels["label_0"]).toBe(true);
-        expect(allLabels["label_1"]).toBe(true);
-        expect(allLabels["label_2"]).toBe(true);
-        expect(activeOutputs_1.count()).toBe(3);
-        expect(activeOutputs_1.entries["output_0"].label).toBe(null);
-        expect(activeOutputs_1.entries["output_1"].label).toBe(null);
-        expect(activeOutputs_1.entries["output_2"].label).toBe("label_2");
-
-        // Test toggle / removal
-        activeOutputs_1.toggle("output_0");
-        expect(activeOutputs_1.count()).toBe(2);
-        activeOutputs_1.toggle("output_1");
-        expect(activeOutputs_1.count()).toBe(1);
-        activeOutputs_1.toggle("output_0");
-        expect(activeOutputs_1.count()).toBe(2);
-        activeOutputs_1.toggle("output_1");
-        expect(activeOutputs_1.count()).toBe(3);
-
-        // Test output filtering
-        activeOutputs.filterOutputs(["output_0", "output_2"]);
-        expect(activeOutputs.count()).toBe(2);
-        expect(activeOutputs.entries["output_0"].label).toBe("label_0");
-        expect(activeOutputs.entries["output_1"]).toBe(undefined);
-        expect(activeOutputs.entries["output_2"].label).toBe("label_1");
-
-        // Update output label
-        const response = activeOutputs.labelOutput("output_0", "label_3");
-        expect(response).toBe(true);
-        expect(activeOutputs.entries["output_0"].label).toBe("label_3");
-        const response_1 = activeOutputs.labelOutput("output_0", "label_1");
-        expect(response_1).toBe(false);
-        expect(activeOutputs.entries["output_0"].label).toBe("label_3");
-
-        // Test output removal
-        activeOutputs.filterOutputs([]);
-        expect(Object.keys(allLabels).length).toBe(1);
-    });
-});
diff --git a/client/src/components/Workflow/Editor/modules/parameters.js b/client/src/components/Workflow/Editor/modules/parameters.ts
similarity index 58%
rename from client/src/components/Workflow/Editor/modules/parameters.js
rename to client/src/components/Workflow/Editor/modules/parameters.ts
index cc71e32162d..a1521b18791 100644
--- a/client/src/components/Workflow/Editor/modules/parameters.js
+++ b/client/src/components/Workflow/Editor/modules/parameters.ts
@@ -1,28 +1,44 @@
-import Utils from "utils/utils";
+import type { Step, Steps, PostJobAction } from "@/stores/workflowStepStore";
+import Utils from "@/utils/utils";
 
 class UntypedParameterReference {
-    constructor(parameter, node) {
+    stepId: number;
+
+    constructor(parameter: UntypedParameter, step: Step) {
         parameter.references.push(this);
-        this.nodeId = node.id;
+        this.stepId = step.id;
     }
 }
 
 class ToolInputUntypedParameterReference extends UntypedParameterReference {
-    constructor(parameter, node, tooInput) {
-        super(parameter, node);
-        this.toolInput = tooInput;
+    // TODO: replace any when we have a defined tool state
+    toolInput: any;
+
+    constructor(parameter: UntypedParameter, step: Step, toolInput: any) {
+        super(parameter, step);
+        this.toolInput = toolInput;
     }
 }
 
 class PjaUntypedParameterReference extends UntypedParameterReference {
-    constructor(parameter, node, pja) {
-        super(parameter, node);
+    pja: PostJobAction;
+
+    constructor(parameter: UntypedParameter, step: Step, pja: PostJobAction) {
+        super(parameter, step);
         this.pja = pja;
     }
 }
 
+type UntypedParameterReferenceTypes =
+    | UntypedParameterReference
+    | ToolInputUntypedParameterReference
+    | PjaUntypedParameterReference;
+
 class UntypedParameter {
-    constructor(name) {
+    name: string;
+    references: UntypedParameterReferenceTypes[];
+
+    constructor(name: string) {
         this.name = name;
         this.references = [];
     }
@@ -36,11 +52,13 @@ class UntypedParameter {
 }
 
 export class UntypedParameters {
+    parameters: UntypedParameter[];
+
     constructor() {
         this.parameters = [];
     }
 
-    getParameter(name) {
+    getParameter(name: string) {
         for (const parameter of this.parameters) {
             if (parameter.name == name) {
                 return parameter;
@@ -51,30 +69,31 @@ export class UntypedParameters {
         return untypedParameter;
     }
 
-    getParameterFromMatch(match) {
+    getParameterFromMatch(match: string) {
         return this.getParameter(match.substring(2, match.length - 1));
     }
 }
 
-export function getUntypedWorkflowParameters(nodes) {
+export function getUntypedWorkflowParameters(steps: Steps) {
     const untypedParameters = new UntypedParameters();
     const parameter_re = /\$\{.+?\}/g;
-    Object.entries(nodes).forEach(([k, node]) => {
-        if (node.config_form && node.config_form.inputs) {
-            Utils.deepeach(node.config_form.inputs, (d) => {
+    Object.values(steps).forEach((step) => {
+        if (step.config_form?.inputs) {
+            // TODO: with new tool state we could type this and drop the any
+            Utils.deepeach(step.config_form.inputs, (d: any) => {
                 if (typeof d.value == "string") {
-                    var form_matches = d.value.match(parameter_re);
-                    if (form_matches) {
-                        for (const match of form_matches) {
+                    const formMatches = d.value.match(parameter_re);
+                    if (formMatches) {
+                        for (const match of formMatches) {
                             const untypedParameter = untypedParameters.getParameterFromMatch(match);
-                            new ToolInputUntypedParameterReference(untypedParameter, node, d);
+                            new ToolInputUntypedParameterReference(untypedParameter, step, d);
                         }
                     }
                 }
             });
         }
-        if (node.postJobActions) {
-            Object.values(node.postJobActions).forEach((pja) => {
+        if (step.post_job_actions) {
+            Object.values(step.post_job_actions).forEach((pja) => {
                 if (pja.action_arguments) {
                     Object.values(pja.action_arguments).forEach((action_argument) => {
                         if (typeof action_argument === "string") {
@@ -82,7 +101,7 @@ export function getUntypedWorkflowParameters(nodes) {
                             if (arg_matches) {
                                 for (const match of arg_matches) {
                                     const untypedParameter = untypedParameters.getParameterFromMatch(match);
-                                    new PjaUntypedParameterReference(untypedParameter, node, pja);
+                                    new PjaUntypedParameterReference(untypedParameter, step, pja);
                                 }
                             }
                         }
diff --git a/client/src/components/Workflow/Editor/modules/services.js b/client/src/components/Workflow/Editor/modules/services.js
index 8377c463fb7..468d5531bb2 100644
--- a/client/src/components/Workflow/Editor/modules/services.js
+++ b/client/src/components/Workflow/Editor/modules/services.js
@@ -1,7 +1,7 @@
 import axios from "axios";
-import { rethrowSimple } from "utils/simple-error";
+import { rethrowSimple, errorMessageAsString } from "utils/simple-error";
 import { getAppRoot } from "onload/loadConfig";
-import { fromSimple, toSimple } from "./model";
+import { toSimple } from "./model";
 
 /** Workflow data request helper **/
 export async function getVersions(id) {
@@ -13,11 +13,14 @@ export async function getVersions(id) {
     }
 }
 
-export async function getModule(request_data) {
+export async function getModule(request_data, stepId, setLoadingState) {
+    setLoadingState(stepId, true);
     try {
         const { data } = await axios.post(`${getAppRoot()}api/workflows/build_module`, request_data);
+        setLoadingState(stepId, false);
         return data;
     } catch (e) {
+        setLoadingState(stepId, false, errorMessageAsString(e));
         rethrowSimple(e);
     }
 }
@@ -36,11 +39,10 @@ export async function refactor(id, actions, dryRun = false) {
     }
 }
 
-export async function loadWorkflow({ workflow, id, version = null, appendData = false }) {
+export async function loadWorkflow({ id, version = null }) {
     try {
         const versionQuery = Number.isInteger(version) ? `version=${version}` : "";
         const { data } = await axios.get(`${getAppRoot()}workflow/load_workflow?_=true&id=${id}&${versionQuery}`);
-        fromSimple(workflow, data, appendData);
         return data;
     } catch (e) {
         console.debug(e);
@@ -66,15 +68,6 @@ export async function saveWorkflow(workflow) {
     return {};
 }
 
-export async function getDatatypeMapping() {
-    try {
-        const { data } = await axios.get(`${getAppRoot()}api/datatypes/mapping`);
-        return data;
-    } catch (e) {
-        rethrowSimple(e);
-    }
-}
-
 export async function getToolPredictions(requestData) {
     try {
         const { data } = await axios.post(`${getAppRoot()}api/workflows/get_tool_predictions`, requestData);
diff --git a/client/src/components/Workflow/Editor/modules/terminals.js b/client/src/components/Workflow/Editor/modules/terminals.js
deleted file mode 100644
index 0d0a3401a14..00000000000
--- a/client/src/components/Workflow/Editor/modules/terminals.js
+++ /dev/null
@@ -1,712 +0,0 @@
-import EventEmitter from "events";
-
-const NULL_COLLECTION_TYPE_DESCRIPTION = {
-    isCollection: false,
-    canMatch: function () {
-        return false;
-    },
-    canMapOver: function () {
-        return false;
-    },
-    toString: function () {
-        return "NullCollectionType[]";
-    },
-    append: function (otherCollectionType) {
-        return otherCollectionType;
-    },
-    equal: function (other) {
-        return other === this;
-    },
-};
-
-const ANY_COLLECTION_TYPE_DESCRIPTION = {
-    isCollection: true,
-    canMatch: function (other) {
-        return NULL_COLLECTION_TYPE_DESCRIPTION !== other;
-    },
-    canMapOver: function () {
-        return false;
-    },
-    toString: function () {
-        return "AnyCollectionType[]";
-    },
-    append: function () {
-        return ANY_COLLECTION_TYPE_DESCRIPTION;
-    },
-    equal: function (other) {
-        return other === this;
-    },
-};
-
-class ConnectionAcceptable {
-    constructor(canAccept, reason) {
-        this.canAccept = canAccept;
-        this.reason = reason;
-    }
-}
-
-class CollectionTypeDescription {
-    constructor(collectionType) {
-        this.collectionType = collectionType;
-        this.isCollection = true;
-        this.rank = collectionType.split(":").length;
-    }
-    append(otherCollectionTypeDescription) {
-        if (otherCollectionTypeDescription === NULL_COLLECTION_TYPE_DESCRIPTION) {
-            return this;
-        }
-        if (otherCollectionTypeDescription === ANY_COLLECTION_TYPE_DESCRIPTION) {
-            return otherCollectionTypeDescription;
-        }
-        return new CollectionTypeDescription(`${this.collectionType}:${otherCollectionTypeDescription.collectionType}`);
-    }
-    canMatch(otherCollectionTypeDescription) {
-        if (otherCollectionTypeDescription === NULL_COLLECTION_TYPE_DESCRIPTION) {
-            return false;
-        }
-        if (otherCollectionTypeDescription === ANY_COLLECTION_TYPE_DESCRIPTION) {
-            return true;
-        }
-        return otherCollectionTypeDescription.collectionType == this.collectionType;
-    }
-    canMapOver(otherCollectionTypeDescription) {
-        if (otherCollectionTypeDescription === NULL_COLLECTION_TYPE_DESCRIPTION) {
-            return false;
-        }
-        if (otherCollectionTypeDescription === ANY_COLLECTION_TYPE_DESCRIPTION) {
-            return false;
-        }
-        if (this.rank <= otherCollectionTypeDescription.rank) {
-            // Cannot map over self...
-            return false;
-        }
-        var requiredSuffix = otherCollectionTypeDescription.collectionType;
-        return this._endsWith(this.collectionType, requiredSuffix);
-    }
-    effectiveMapOver(otherCollectionTypeDescription) {
-        var otherCollectionType = otherCollectionTypeDescription.collectionType;
-        var effectiveCollectionType = this.collectionType.substring(
-            0,
-            this.collectionType.length - otherCollectionType.length - 1
-        );
-        return new CollectionTypeDescription(effectiveCollectionType);
-    }
-    equal(otherCollectionTypeDescription) {
-        return otherCollectionTypeDescription.collectionType == this.collectionType;
-    }
-    toString() {
-        return `CollectionType[${this.collectionType}]`;
-    }
-    _endsWith(str, suffix) {
-        return str.indexOf(suffix, str.length - suffix.length) !== -1;
-    }
-}
-
-class Terminal extends EventEmitter {
-    constructor(attr) {
-        super();
-        this.name = attr.name;
-        this.node = attr.node;
-        this.element = attr.element;
-        this.mapOver = attr.mapOver || NULL_COLLECTION_TYPE_DESCRIPTION;
-        this.attributes = attr;
-        this.connectors = [];
-    }
-    connect(connector) {
-        this.connectors.push(connector);
-        this.emit("change");
-    }
-    disconnect(connector) {
-        const connectorIndex = this.connectors.findIndex((c) => c === connector);
-        this.connectors.splice(connectorIndex, 1);
-        this.resetMappingIfNeeded();
-        if (!connector.dragging) {
-            connector.inputHandle.resetCollectionTypeSource();
-        }
-        this.emit("change");
-    }
-    redraw() {
-        this.connectors.forEach((c) => {
-            c.redraw();
-        });
-    }
-    destroy() {
-        this.connectors.slice().forEach((c) => {
-            c.destroy();
-        });
-        this.emit("change");
-    }
-    destroyInvalidConnections() {
-        this.connectors.forEach((connector) => {
-            if (connector) {
-                connector.destroyIfInvalid();
-            }
-        });
-        this.emit("change");
-    }
-    setMapOver(val) {
-        let output_val = val;
-        if (this.multiple) {
-            // emulate list input
-            const description = new CollectionTypeDescription("list");
-            if (val.collectionType === description.collectionType) {
-                // No mapping over necessary
-                return;
-            }
-            output_val = val.effectiveMapOver ? val.effectiveMapOver(description) : val;
-        }
-        if (!this.mapOver.equal(val)) {
-            this.mapOver = val;
-            this.node.mapOver = output_val;
-            Object.values(this.node.outputTerminals).forEach((outputTerminal) => {
-                outputTerminal.setMapOver(output_val);
-            });
-        }
-        this.emit("change");
-    }
-    isMappedOver() {
-        return this.mapOver.isCollection;
-    }
-    resetMapping() {
-        this.mapOver = NULL_COLLECTION_TYPE_DESCRIPTION;
-        this.node.mapOver = undefined;
-        this.emit("change");
-    }
-    resetCollectionTypeSource() {
-        const node = this.node;
-        Object.values(node.outputTerminals).forEach((output_terminal) => {
-            const type_source = output_terminal.attributes.collection_type_source;
-            if (type_source && output_terminal.attributes.collection_type) {
-                output_terminal.attributes.collection_type = null;
-                output_terminal.update(output_terminal.attributes);
-            }
-        });
-    }
-    hasConnectedMappedInputTerminals() {
-        const node = this.node;
-        const inputTerminals = node.inputTerminals;
-        for (const inputName in inputTerminals) {
-            const inputTerminal = inputTerminals[inputName];
-            if (inputTerminal.connectors.length > 0 && inputTerminal.isMappedOver()) {
-                return true;
-            }
-        }
-        return false;
-    }
-    hasConnectedOutputTerminals() {
-        const node = this.node;
-        const outputTerminals = node.outputTerminals;
-        for (const outputName in outputTerminals) {
-            if (outputTerminals[outputName].connectors.length > 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-    hasMappedOverInputTerminals() {
-        const node = this.node;
-        const inputTerminals = node.inputTerminals;
-        for (const inputName in inputTerminals) {
-            const terminal = inputTerminals[inputName];
-            if (terminal.mapOver.isCollection) {
-                return true;
-            }
-        }
-        return false;
-    }
-    // Subclasses should override this...
-    resetMappingIfNeeded() {}
-}
-
-class BaseInputTerminal extends Terminal {
-    constructor(attr) {
-        super(attr);
-        this.datatypesMapper = attr.datatypesMapper;
-        this.update(attr.input); // subclasses should implement this...
-    }
-    setDefaultMapOver(connector) {
-        var other_output = connector.outputHandle;
-        if (other_output) {
-            var otherCollectionType = this._otherCollectionType(other_output);
-            if (otherCollectionType.isCollection) {
-                this.setMapOver(otherCollectionType);
-            }
-        }
-    }
-    canAccept(other) {
-        if (this._inputFilled()) {
-            return new ConnectionAcceptable(
-                false,
-                "Input already filled with another connection, delete it before connecting another output."
-            );
-        } else {
-            return this.attachable(other);
-        }
-    }
-    resetMappingIfNeeded() {
-        var mapOver = this.mapOver;
-        if (!mapOver.isCollection) {
-            return;
-        }
-        // No output terminals are counting on this being mapped
-        // over if connected inputs are still mapped over or if none
-        // of the outputs are connected...
-        var reset = this.hasConnectedMappedInputTerminals() || !this.hasConnectedOutputTerminals();
-        if (reset) {
-            this.resetMapping();
-        }
-    }
-    resetMapping() {
-        super.resetMapping();
-        if (!this.hasMappedOverInputTerminals()) {
-            Object.values(this.node.outputTerminals).forEach((terminal) => {
-                // This shouldn't be called if there are mapped over
-                // outputs.
-                terminal.resetMapping();
-            });
-        }
-    }
-    connected() {
-        return this.connectors.length !== 0;
-    }
-    _inputFilled() {
-        var inputFilled;
-        if (!this.connected()) {
-            inputFilled = false;
-        } else {
-            if (this.multiple) {
-                // Can only attach one collection to multiple input
-                // data parameter.
-                inputFilled = !!this._collectionAttached();
-            } else {
-                inputFilled = true;
-            }
-        }
-        return inputFilled;
-    }
-    _collectionAttached() {
-        if (!this.connected()) {
-            return false;
-        } else {
-            var firstOutput = this.connectors[0].outputHandle;
-            if (!firstOutput) {
-                return false;
-            } else {
-                if (
-                    firstOutput.isCollection ||
-                    firstOutput.isMappedOver() ||
-                    firstOutput.datatypes.indexOf("input") > 0
-                ) {
-                    return true;
-                } else {
-                    return false;
-                }
-            }
-        }
-    }
-    _mappingConstraints() {
-        // If this is a connected terminal, return list of collection types
-        // other terminals connected to node are constraining mapping to.
-        const node = this.node;
-        if (!node) {
-            return []; // No node - completely unconstrained
-        }
-        var mapOver = this.mapOver;
-        if (mapOver.isCollection) {
-            return [mapOver];
-        }
-        const constraints = [];
-        if (!this.hasConnectedOutputTerminals()) {
-            Object.values(node.inputTerminals).forEach((t) => {
-                const mapOver = t.mapOver;
-                if (mapOver.isCollection) {
-                    if (t.connectors.length > 0) {
-                        constraints.push(t.mapOver);
-                    }
-                }
-            });
-        } else {
-            // All outputs should have same mapOver status - least specific.
-            constraints.push(Object.values(node.outputTerminals)[0].mapOver);
-        }
-        return constraints;
-    }
-    _producesAcceptableDatatype(other) {
-        // other is a non-collection output...
-
-        if (other instanceof OutputParameterTerminal) {
-            return new ConnectionAcceptable(false, "Cannot connect workflow parameter to data input.");
-        }
-
-        for (const t in this.datatypes) {
-            const thisDatatype = this.datatypes[t];
-            if (thisDatatype == "input") {
-                return new ConnectionAcceptable(true, null);
-            }
-            // FIXME: No idea what to do about case when datatype is 'input'
-            const validMatch = other.datatypes.some(
-                (other_datatype) =>
-                    other_datatype == "input" ||
-                    other_datatype == "_sniff_" ||
-                    this._isSubType(other_datatype, thisDatatype)
-            );
-            if (validMatch) {
-                return new ConnectionAcceptable(true, null);
-            }
-        }
-        const datatypesSet = new Set(this.datatypesMapper.datatypes);
-        const invalidDatatypes = other.datatypes.filter((datatype) => !datatypesSet.has(datatype));
-        if (invalidDatatypes.length) {
-            return new ConnectionAcceptable(
-                false,
-                `Effective output data type(s) [${invalidDatatypes.join(
-                    ", "
-                )}] unknown. This tool cannot be run on this Galaxy Server at this moment, please contact the Administrator.`
-            );
-        }
-        return new ConnectionAcceptable(
-            false,
-            `Effective output data type(s) [${other.datatypes.join(
-                ", "
-            )}] do not appear to match input type(s) [${this.datatypes.join(", ")}].`
-        );
-    }
-    _isSubType(child, parent) {
-        return this.datatypesMapper.isSubType(child, parent);
-    }
-    _producesAcceptableDatatypeAndOptionalness(other) {
-        if (!this.optional && !this.multiple && other.optional) {
-            return new ConnectionAcceptable(false, "Cannot connect an optional output to a non-optional input");
-        }
-        return this._producesAcceptableDatatype(other);
-    }
-    _otherCollectionType(other) {
-        var otherCollectionType = NULL_COLLECTION_TYPE_DESCRIPTION;
-        if (other.isCollection) {
-            otherCollectionType = other.collectionType;
-        }
-        var otherMapOver = other.mapOver;
-        if (otherMapOver.isCollection) {
-            otherCollectionType = otherMapOver.append(otherCollectionType);
-        }
-        return otherCollectionType;
-    }
-}
-
-class InputTerminal extends BaseInputTerminal {
-    update(input) {
-        this.datatypes = input.extensions;
-        this.multiple = input.multiple;
-        this.optional = input.optional;
-        this.collection = false;
-    }
-    connect(connector) {
-        super.connect(connector);
-        this.setDefaultMapOver(connector);
-    }
-    attachable(other) {
-        var otherCollectionType = this._otherCollectionType(other);
-        var mapOver = this.mapOver;
-        if (otherCollectionType.isCollection) {
-            if (this.multiple) {
-                if (this.connected() && !this._collectionAttached()) {
-                    return new ConnectionAcceptable(
-                        false,
-                        "Cannot attach collections to data parameters with individual data inputs already attached."
-                    );
-                }
-                if (otherCollectionType.collectionType && otherCollectionType.collectionType.endsWith("paired")) {
-                    return new ConnectionAcceptable(
-                        false,
-                        "Cannot attach paired inputs to multiple data parameters, only lists may be treated this way."
-                    );
-                }
-            }
-            if (mapOver.isCollection && mapOver.canMatch(otherCollectionType)) {
-                return this._producesAcceptableDatatypeAndOptionalness(other);
-            } else if (this.multiple && new CollectionTypeDescription("list").canMatch(otherCollectionType)) {
-                // This handles the special case of a list input being connected to a multiple="true" data input.
-                // Nested lists would be correctly mapped over by the above condition.
-                return this._producesAcceptableDatatypeAndOptionalness(other);
-            } else {
-                //  Need to check if this would break constraints...
-                var mappingConstraints = this._mappingConstraints();
-                if (mappingConstraints.every(otherCollectionType.canMatch.bind(otherCollectionType))) {
-                    return this._producesAcceptableDatatypeAndOptionalness(other);
-                } else {
-                    if (mapOver.isCollection) {
-                        // incompatible collection type attached
-                        if (this.hasConnectedMappedInputTerminals()) {
-                            return new ConnectionAcceptable(
-                                false,
-                                "Can't map over this input with output collection type - other inputs have an incompatible map over collection type. Disconnect inputs (and potentially outputs) and retry."
-                            );
-                        } else {
-                            return new ConnectionAcceptable(
-                                false,
-                                "Can't map over this input with output collection type - this step has outputs defined constraining the mapping of this tool. Disconnect outputs and retry."
-                            );
-                        }
-                    } else {
-                        return new ConnectionAcceptable(
-                            false,
-                            "Can't map over this input with output collection type - an output of this tool is not mapped over constraining this input. Disconnect output(s) and retry."
-                        );
-                    }
-                }
-            }
-        } else if (mapOver.isCollection) {
-            return new ConnectionAcceptable(
-                false,
-                "Cannot attach non-collection outputs to mapped over inputs, consider disconnecting inputs and outputs to reset this input's mapping."
-            );
-        }
-        return this._producesAcceptableDatatypeAndOptionalness(other);
-    }
-}
-
-class InputParameterTerminal extends BaseInputTerminal {
-    update(input) {
-        this.type = input.type;
-        this.optional = input.optional;
-    }
-    connect(connector) {
-        super.connect(connector);
-        this.setDefaultMapOver(connector);
-    }
-    effectiveType(parameterType) {
-        return parameterType == "select" ? "text" : parameterType;
-    }
-    attachable(other) {
-        const effectiveThisType = this.effectiveType(this.type);
-        const effectiveOtherType = this.effectiveType(other.attributes.type);
-        return new ConnectionAcceptable(effectiveThisType == effectiveOtherType, "");
-    }
-}
-
-class InputCollectionTerminal extends BaseInputTerminal {
-    update(input) {
-        this.multiple = false;
-        this.collection = true;
-        this.collection_type = input.collection_type;
-        this.datatypes = input.extensions;
-        this.optional = input.optional;
-        var collectionTypes = [];
-        if (input.collection_types) {
-            input.collection_types.forEach((collectionType) => {
-                collectionTypes.push(new CollectionTypeDescription(collectionType));
-            });
-        } else {
-            collectionTypes.push(ANY_COLLECTION_TYPE_DESCRIPTION);
-        }
-        this.collectionTypes = collectionTypes;
-    }
-    connect(connector) {
-        super.connect(connector);
-        var other = connector.outputHandle;
-        if (other) {
-            const node = this.node;
-            Object.values(node.outputTerminals).forEach((output_terminal) => {
-                if (output_terminal.attributes.collection_type_source && !connector.dragging) {
-                    if (other.isMappedOver()) {
-                        if (other.isCollection) {
-                            output_terminal.attributes.collection_type = other.mapOver.append(
-                                other.collectionType
-                            ).collectionType;
-                        } else {
-                            output_terminal.attributes.collection_type = other.mapOver.collectionType;
-                        }
-                    } else {
-                        output_terminal.attributes.collection_type = other.attributes.collection_type;
-                    }
-                    output_terminal.update(output_terminal.attributes);
-                }
-            });
-        }
-
-        var effectiveMapOver = this._effectiveMapOver(other);
-        this.setMapOver(effectiveMapOver);
-    }
-    _effectiveMapOver(other) {
-        var collectionTypes = this.collectionTypes;
-        var otherCollectionType = this._otherCollectionType(other);
-        var canMatch = collectionTypes.some((collectionType) => collectionType.canMatch(otherCollectionType));
-        if (!canMatch) {
-            for (var collectionTypeIndex in collectionTypes) {
-                var collectionType = collectionTypes[collectionTypeIndex];
-                if (otherCollectionType.canMapOver(collectionType)) {
-                    var effectiveMapOver = otherCollectionType.effectiveMapOver(collectionType);
-                    if (effectiveMapOver != NULL_COLLECTION_TYPE_DESCRIPTION) {
-                        return effectiveMapOver;
-                    }
-                }
-            }
-        }
-        return NULL_COLLECTION_TYPE_DESCRIPTION;
-    }
-    _effectiveCollectionTypes() {
-        var mapOver = this.mapOver;
-        return this.collectionTypes.map((t) => mapOver.append(t));
-    }
-    attachable(other) {
-        var otherCollectionType = this._otherCollectionType(other);
-        if (otherCollectionType.isCollection) {
-            var effectiveCollectionTypes = this._effectiveCollectionTypes();
-            var mapOver = this.mapOver;
-            var canMatch = effectiveCollectionTypes.some((effectiveCollectionType) =>
-                effectiveCollectionType.canMatch(otherCollectionType)
-            );
-            if (canMatch) {
-                // Only way a direct match...
-                return this._producesAcceptableDatatypeAndOptionalness(other);
-                // Otherwise we need to mapOver
-            } else if (mapOver.isCollection) {
-                // In this case, mapOver already set and we didn't match skipping...
-                if (this.hasConnectedMappedInputTerminals()) {
-                    return new ConnectionAcceptable(
-                        false,
-                        "Can't map over this input with output collection type - other inputs have an incompatible map over collection type. Disconnect inputs (and potentially outputs) and retry."
-                    );
-                } else {
-                    return new ConnectionAcceptable(
-                        false,
-                        "Can't map over this input with output collection type - this step has outputs defined constraining the mapping of this tool. Disconnect outputs and retry."
-                    );
-                }
-            } else if (this.collectionTypes.some((collectionType) => otherCollectionType.canMapOver(collectionType))) {
-                // we're not mapped over - but hey maybe we could be... lets check.
-                var effectiveMapOver = this._effectiveMapOver(other);
-                if (!effectiveMapOver.isCollection) {
-                    return new ConnectionAcceptable(false, "Incompatible collection type(s) for attachment.");
-                }
-                //  Need to check if this would break constraints...
-                var mappingConstraints = this._mappingConstraints();
-                if (mappingConstraints.every((d) => effectiveMapOver.canMatch(d))) {
-                    return this._producesAcceptableDatatypeAndOptionalness(other);
-                } else {
-                    if (this.hasConnectedMappedInputTerminals()) {
-                        return new ConnectionAcceptable(
-                            false,
-                            "Can't map over this input with output collection type - other inputs have an incompatible map over collection type. Disconnect inputs (and potentially outputs) and retry."
-                        );
-                    } else {
-                        return new ConnectionAcceptable(
-                            false,
-                            "Can't map over this input with output collection type - this step has outputs defined constraining the mapping of this tool. Disconnect outputs and retry."
-                        );
-                    }
-                }
-            } else {
-                return new ConnectionAcceptable(false, "Incompatible collection type(s) for attachment.");
-            }
-        } else {
-            return new ConnectionAcceptable(false, "Cannot attach a data output to a collection input.");
-        }
-    }
-}
-
-class BaseOutputTerminal extends Terminal {
-    constructor(attr) {
-        super(attr);
-        this.datatypes = attr.datatypes;
-        this.optional = attr.optional;
-        if (this.node.mapOver) {
-            this.setMapOver(this.node.mapOver);
-        }
-    }
-    update(output) {
-        this.datatypes = output.datatypes || output.extensions;
-        this.optional = output.optional;
-    }
-}
-
-class OutputTerminal extends BaseOutputTerminal {
-    resetMappingIfNeeded() {
-        // If inputs were only mapped over to preserve
-        // an output just disconnected reset these...
-        if (!this.hasConnectedOutputTerminals() && !this.hasConnectedMappedInputTerminals()) {
-            const node = this.node;
-            Object.values(node.inputTerminals).forEach((t) => {
-                if (t.mapOver.isCollection) {
-                    t.resetMappingIfNeeded();
-                }
-            });
-        }
-        var noMappedInputs = !this.hasMappedOverInputTerminals();
-        if (noMappedInputs) {
-            this.resetMapping();
-        }
-    }
-    resetMapping() {
-        super.resetMapping();
-        this.connectors.forEach((connector) => {
-            var connectedInput = connector.inputHandle;
-            if (connectedInput) {
-                // Not exactly right because this is still connected.
-                // Either rewrite resetMappingIfNeeded or disconnect
-                // and reconnect if valid.
-                connectedInput.resetMappingIfNeeded();
-                connector.destroyIfInvalid();
-            }
-        });
-    }
-}
-
-class OutputCollectionTerminal extends BaseOutputTerminal {
-    constructor(attr) {
-        super(attr);
-        if (attr.collection_type) {
-            this.collectionType = new CollectionTypeDescription(attr.collection_type);
-        } else {
-            var collectionTypeSource = attr.collection_type_source;
-            if (!collectionTypeSource) {
-                console.log("Warning: No collection type or collection type source defined.");
-            }
-            this.collectionType = ANY_COLLECTION_TYPE_DESCRIPTION;
-        }
-        this.isCollection = true;
-    }
-    update(output) {
-        super.update(output);
-        var newCollectionType;
-        if (output.collection_type) {
-            newCollectionType = new CollectionTypeDescription(output.collection_type);
-        } else {
-            var collectionTypeSource = output.collection_type_source;
-            if (!collectionTypeSource) {
-                console.log("Warning: No collection type or collection type source defined.");
-            }
-            newCollectionType = ANY_COLLECTION_TYPE_DESCRIPTION;
-        }
-        const oldCollectionType = this.collectionType;
-        this.collectionType = newCollectionType;
-        // we need to iterate over a copy, as we slice this.connectors in the process of destroying connections
-        var connectors = this.connectors.slice(0);
-        if (newCollectionType.collectionType != oldCollectionType.collectionType) {
-            connectors.forEach((connector) => {
-                connector.destroyIfInvalid(true);
-            });
-        }
-    }
-}
-
-class OutputParameterTerminal extends Terminal {
-    update(output) {
-        this.attributes.type = output.type;
-    }
-}
-
-export default {
-    Terminal: Terminal,
-    InputTerminal: InputTerminal,
-    InputParameterTerminal: InputParameterTerminal,
-    OutputTerminal: OutputTerminal,
-    OutputParameterTerminal: OutputParameterTerminal,
-    InputCollectionTerminal: InputCollectionTerminal,
-    OutputCollectionTerminal: OutputCollectionTerminal,
-
-    // export required for unit tests
-    CollectionTypeDescription: CollectionTypeDescription,
-    NULL_COLLECTION_TYPE_DESCRIPTION: NULL_COLLECTION_TYPE_DESCRIPTION,
-    ANY_COLLECTION_TYPE_DESCRIPTION: ANY_COLLECTION_TYPE_DESCRIPTION,
-};
diff --git a/client/src/components/Workflow/Editor/modules/terminals.test.ts b/client/src/components/Workflow/Editor/modules/terminals.test.ts
new file mode 100644
index 00000000000..ded5054db32
--- /dev/null
+++ b/client/src/components/Workflow/Editor/modules/terminals.test.ts
@@ -0,0 +1,496 @@
+import { setActivePinia, createPinia } from "pinia";
+
+import { useWorkflowStepStore } from "@/stores/workflowStepStore";
+import {
+    terminalFactory,
+    InputCollectionTerminal,
+    InputTerminal,
+    InputParameterTerminal,
+    OutputCollectionTerminal,
+    OutputTerminal,
+    OutputParameterTerminal,
+    producesAcceptableDatatype,
+} from "./terminals";
+import { testDatatypesMapper } from "@/components/Datatypes/test_fixtures";
+import { useConnectionStore } from "@/stores/workflowConnectionStore";
+import type { DataOutput, Steps } from "@/stores/workflowStepStore";
+import { NULL_COLLECTION_TYPE_DESCRIPTION } from "./collectionTypeDescription";
+import { simpleSteps, advancedSteps } from "../test_fixtures";
+
+function setupAdvanced() {
+    const terminals: { [index: string]: { [index: string]: ReturnType<typeof terminalFactory> } } = {};
+    Object.values(advancedSteps).map((step) => {
+        const stepLabel = step.label;
+        if (stepLabel) {
+            terminals[stepLabel] = {};
+            step.inputs?.map((input) => {
+                terminals[stepLabel][input.name] = terminalFactory(step.id, input, testDatatypesMapper);
+            });
+            step.outputs?.map((output) => {
+                terminals[stepLabel][output.name] = terminalFactory(step.id, output, testDatatypesMapper);
+            });
+        }
+    });
+    return terminals;
+}
+
+describe("terminalFactory", () => {
+    let terminals: { [index: string]: { [index: string]: ReturnType<typeof terminalFactory> } } = {};
+    beforeEach(() => {
+        setActivePinia(createPinia());
+        terminals = setupAdvanced();
+    });
+
+    it("constructs correct class instances", () => {
+        expect(terminals["data input"]["output"]).toBeInstanceOf(OutputTerminal);
+        expect(terminals["simple data"]["input"]).toBeInstanceOf(InputTerminal);
+        expect(terminals["simple data"]["out_file1"]).toBeInstanceOf(OutputTerminal);
+        expect(terminals["simple data 2"]["input"]).toBeInstanceOf(InputTerminal);
+        expect(terminals["simple data 2"]["out_file1"]).toBeInstanceOf(OutputTerminal);
+        expect(terminals["multiple simple data"]["input1"]).toBeInstanceOf(InputTerminal);
+        expect(terminals["multiple simple data"]["queries_0|input2"]).toBeInstanceOf(InputTerminal);
+        expect(terminals["multiple simple data"]["out_file1"]).toBeInstanceOf(OutputTerminal);
+        expect(terminals["optional data input"]["output"]).toBeInstanceOf(OutputTerminal);
+        expect(terminals["list input"]["output"]).toBeInstanceOf(OutputCollectionTerminal);
+        expect(terminals["list:list input"]["output"]).toBeInstanceOf(OutputCollectionTerminal);
+        expect(terminals["paired input"]["output"]).toBeInstanceOf(OutputCollectionTerminal);
+        expect(terminals["multi data"]["f1"]).toBeInstanceOf(InputTerminal);
+        expect(terminals["multi data"]["f2"]).toBeInstanceOf(InputTerminal);
+        expect(terminals["multi data"]["out1"]).toBeInstanceOf(OutputTerminal);
+        expect(terminals["multi data"]["out2"]).toBeInstanceOf(OutputTerminal);
+        expect(terminals["integer parameter input"]["output"]).toBeInstanceOf(OutputParameterTerminal);
+        expect(terminals["any collection"]["input"]).toBeInstanceOf(InputCollectionTerminal);
+        expect(terminals["any collection"]["output"]).toBeInstanceOf(OutputCollectionTerminal);
+        expect(terminals["multi data"]["advanced|advanced_threshold"]).toBeInstanceOf(InputParameterTerminal);
+        expect(terminals["list collection input"]["input1"]).toBeInstanceOf(InputCollectionTerminal);
+    });
+    it("throws error on invalid terminalSource", () => {
+        const invalidFactory = () => terminalFactory(1, {} as any, testDatatypesMapper);
+        expect(invalidFactory).toThrow();
+    });
+});
+
+describe("canAccept", () => {
+    let terminals: { [index: string]: { [index: string]: ReturnType<typeof terminalFactory> } } = {};
+    let stepStore: ReturnType<typeof useWorkflowStepStore>;
+    let connectionStore: ReturnType<typeof useConnectionStore>;
+    beforeEach(() => {
+        setActivePinia(createPinia());
+        terminals = setupAdvanced();
+        stepStore = useWorkflowStepStore();
+        connectionStore = useConnectionStore();
+        Object.values(JSON.parse(JSON.stringify(advancedSteps)) as Steps).map((step) => {
+            stepStore.addStep(step);
+        });
+    });
+
+    it("accepts simple data -> data connections", () => {
+        const dataOut = terminals["data input"]["output"] as OutputTerminal;
+        const dataIn = terminals["simple data"]["input"] as InputTerminal;
+        expect(dataIn.canAccept(dataOut).canAccept).toBe(true);
+        dataIn.connect(dataOut);
+        expect(dataIn.canAccept(dataOut).canAccept).toBe(false);
+        dataIn.disconnect(dataOut);
+        expect(dataIn.canAccept(dataOut).canAccept).toBe(true);
+    });
+    it("accepts collection data -> data connection", () => {
+        const collectionOut = terminals["list input"]["output"] as OutputCollectionTerminal;
+        const dataIn = terminals["simple data"]["input"] as InputTerminal;
+        expect(dataIn.mapOver).toBe(NULL_COLLECTION_TYPE_DESCRIPTION);
+        expect(dataIn.canAccept(collectionOut).canAccept).toBe(true);
+        dataIn.connect(collectionOut);
+        expect(dataIn.mapOver).toEqual({ collectionType: "list", isCollection: true, rank: 1 });
+        expect(dataIn.canAccept(collectionOut).canAccept).toBe(false);
+        dataIn.disconnect(collectionOut);
+        expect(dataIn.canAccept(collectionOut).canAccept).toBe(true);
+        expect(dataIn.mapOver).toEqual(NULL_COLLECTION_TYPE_DESCRIPTION);
+    });
+    it("accepts mapped over data output on mapped over data input", () => {
+        const collectionOut = terminals["list input"]["output"] as OutputCollectionTerminal;
+        const dataIn = terminals["multiple simple data"]["input1"] as InputTerminal;
+        const dataInTwo = terminals["multiple simple data"]["queries_0|input2"] as InputTerminal;
+        dataIn.connect(collectionOut);
+        expect(dataInTwo.canAccept(collectionOut).canAccept).toBe(true);
+    });
+    it("accepts list:list data -> data connection", () => {
+        const collectionOut = terminals["list:list input"]["output"] as OutputCollectionTerminal;
+        const dataIn = terminals["simple data"]["input"] as InputTerminal;
+        expect(dataIn.mapOver).toBe(NULL_COLLECTION_TYPE_DESCRIPTION);
+        expect(dataIn.canAccept(collectionOut).canAccept).toBe(true);
+        dataIn.connect(collectionOut);
+        expect(dataIn.mapOver).toEqual({ collectionType: "list:list", isCollection: true, rank: 2 });
+        expect(dataIn.canAccept(collectionOut).canAccept).toBe(false);
+        dataIn.disconnect(collectionOut);
+        expect(dataIn.canAccept(collectionOut).canAccept).toBe(true);
+        expect(dataIn.mapOver).toEqual(NULL_COLLECTION_TYPE_DESCRIPTION);
+    });
+    it("treats multi data input as list input", () => {
+        const collectionOut = terminals["list input"]["output"] as OutputCollectionTerminal;
+        const multiDataIn = terminals["multi data"]["f1"] as InputTerminal;
+        expect(multiDataIn.canAccept(collectionOut).canAccept).toBe(true);
+        multiDataIn.connect(collectionOut);
+        expect(multiDataIn.mapOver).toBe(NULL_COLLECTION_TYPE_DESCRIPTION);
+    });
+    it("accepts separate list:list inputs on separate multi-data inputs of same tool", () => {
+        const collectionOut = terminals["list:list input"]["output"] as OutputCollectionTerminal;
+        const multiDataInOne = terminals["multi data"]["f1"] as InputTerminal;
+        const multiDataInTwo = terminals["multi data"]["f2"] as InputTerminal;
+        multiDataInOne.connect(collectionOut);
+        expect(multiDataInTwo.canAccept(collectionOut).canAccept).toBe(true);
+    });
+    it("rejects connecting output to input of same step", () => {
+        const dataOut = terminals["simple data"]["out_file1"] as OutputTerminal;
+        const dataIn = terminals["simple data"]["input"] as InputTerminal;
+        expect(dataIn.canAccept(dataOut).canAccept).toBe(false);
+        expect(dataIn.canAccept(dataOut).reason).toBe("Cannot connection output to input of same step.");
+    });
+    it("rejects paired input on multi-data input", () => {
+        const multiDataIn = terminals["multi data"]["f1"] as InputTerminal;
+        const pairedOut = terminals["paired input"]["output"] as OutputCollectionTerminal;
+        expect(multiDataIn.canAccept(pairedOut).canAccept).toBe(false);
+        expect(multiDataIn.canAccept(pairedOut).reason).toBe(
+            "Cannot attach paired inputs to multiple data parameters, only lists may be treated this way."
+        );
+    });
+    it("rejects collections on multi data inputs if non-collection already connected", () => {
+        const multiDataIn = terminals["multi data"]["f1"] as InputTerminal;
+        const dataOut = terminals["data input"]["output"] as OutputTerminal;
+        const collectionOut = terminals["list input"]["output"] as OutputCollectionTerminal;
+        multiDataIn.connect(dataOut);
+        expect(multiDataIn.canAccept(collectionOut).canAccept).toBe(false);
+        expect(multiDataIn.canAccept(collectionOut).reason).toBe(
+            "Cannot attach collections to data parameters with individual data inputs already attached."
+        );
+    });
+    it("maps list:list over multi data input", () => {
+        const collectionOut = terminals["list:list input"]["output"] as OutputCollectionTerminal;
+        const multiDataIn = terminals["multi data"]["f1"] as InputTerminal;
+        expect(multiDataIn.canAccept(collectionOut).canAccept).toBe(true);
+        multiDataIn.connect(collectionOut);
+        expect(multiDataIn.mapOver).toEqual({ collectionType: "list", isCollection: true, rank: 1 });
+    });
+    it("rejects attaching multiple collections to a single multi data input", () => {
+        const collectionOut = terminals["list:list input"]["output"] as OutputCollectionTerminal;
+        const otherCollectionOut = terminals["list:list input"]["output"] as OutputCollectionTerminal;
+        const multiDataIn = terminals["multi data"]["f1"] as InputTerminal;
+        multiDataIn.connect(collectionOut);
+        expect(multiDataIn.canAccept(otherCollectionOut).canAccept).toBe(false);
+        expect(multiDataIn.canAccept(otherCollectionOut).reason).toBe(
+            "Input already filled with another connection, delete it before connecting another output."
+        );
+    });
+    it("rejects data -> collection connection", () => {
+        const dataOut = terminals["data input"]["output"] as OutputTerminal;
+        const collectionInput = terminals["any collection"]["input"] as InputCollectionTerminal;
+        expect(collectionInput.canAccept(dataOut).canAccept).toBe(false);
+        expect(collectionInput.canAccept(dataOut).reason).toBe("Cannot attach a data output to a collection input.");
+    });
+    it("rejects optional data -> required data", () => {
+        const optionalDataOut = terminals["optional data input"]["output"] as OutputTerminal;
+        const dataIn = terminals["simple data"]["input"] as InputTerminal;
+        expect(dataIn.canAccept(optionalDataOut).canAccept).toBe(false);
+        expect(dataIn.canAccept(optionalDataOut).reason).toBe(
+            "Cannot connect an optional output to a non-optional input"
+        );
+    });
+    it("rejects parameter to data connection", () => {
+        const dataIn = terminals["simple data"]["input"] as InputTerminal;
+        // # type system would reject this, but test runtime too
+        const integerParam = terminals["integer parameter input"]["output"] as any;
+        expect(dataIn.canAccept(integerParam).canAccept).toBe(false);
+        expect(dataIn.canAccept(integerParam).reason).toBe("Cannot connect workflow parameter to data input.");
+    });
+    it("accepts integer parameter to integer parameter connection", () => {
+        const integerInputParam = terminals["multi data"]["advanced|advanced_threshold"] as InputParameterTerminal;
+        const integerOutputParam = terminals["integer parameter input"]["output"] as OutputParameterTerminal;
+        expect(integerInputParam.canAccept(integerOutputParam).canAccept).toBe(true);
+    });
+    it("rejects text to integer parameter connection", () => {
+        const integerInputParam = terminals["multi data"]["advanced|advanced_threshold"] as InputParameterTerminal;
+        const textOutputParam = terminals["text parameter input"]["output"] as OutputParameterTerminal;
+        expect(integerInputParam.canAccept(textOutputParam).canAccept).toBe(false);
+        expect(integerInputParam.canAccept(textOutputParam).reason).toBe(
+            "Cannot attach a text parameter to a integer input"
+        );
+    });
+    it("rejects data to parameter connection", () => {
+        const dataOut = terminals["data input"]["output"] as OutputTerminal;
+        const integerInputParam = terminals["multi data"]["advanced|advanced_threshold"] as InputParameterTerminal;
+        expect(integerInputParam.canAccept(dataOut).canAccept).toBe(false);
+        expect(integerInputParam.canAccept(dataOut).reason).toBe("Cannot attach a data parameter to a integer input");
+    });
+    it("rejects increasing map over if output connected to data input", () => {
+        const dataIn = terminals["simple data"]["input"] as InputTerminal;
+        const dataOut = terminals["simple data"]["out_file1"] as OutputTerminal;
+        const constrainingDataIn = terminals["simple data 2"]["input"] as InputTerminal;
+        const collectionOut = terminals["list input"]["output"] as OutputCollectionTerminal;
+        // connect simple data to simple data 2
+        constrainingDataIn.connect(dataOut);
+        // now we can't connect a collection out to the data input of simple data
+        expect(dataIn.canAccept(collectionOut).canAccept).toBe(false);
+        expect(dataIn.canAccept(collectionOut).reason).toBe(
+            "Can't map over this input with output collection type - an output of this tool is mapped over constraining this input. Disconnect output(s) and retry."
+        );
+    });
+    it("rejects increasing map over to list:list if data is mapped over a list input", () => {
+        const collectionOut = terminals["list input"]["output"] as OutputCollectionTerminal;
+        const listListOut = terminals["list:list input"]["output"] as OutputCollectionTerminal;
+        const dataIn = terminals["simple data"]["input"] as InputTerminal;
+        const dataOut = terminals["simple data"]["out_file1"] as OutputTerminal;
+        const dataInTwo = terminals["simple data 2"]["input"] as InputTerminal;
+        dataIn.connect(collectionOut);
+        dataInTwo.connect(dataOut);
+        expect(dataIn.mapOver).toEqual({ collectionType: "list", isCollection: true, rank: 1 });
+        //
+        dataIn.disconnect(collectionOut);
+        // this is weird and not particularly robust, if you save and reload this will most likely not be constrained
+        // TODO: avoid this if possible ...
+        expect(dataIn.mapOver).toEqual({ collectionType: "list", isCollection: true, rank: 1 });
+        expect(dataIn.canAccept(listListOut).canAccept).toBe(false);
+        expect(dataIn.canAccept(listListOut).reason).toBe(
+            "Can't map over this input with output collection type - this step has outputs defined constraining the mapping of this tool. Disconnect outputs and retry."
+        );
+    });
+    it("rejects attaching non-collection outputs to mapper over inputs", () => {
+        const collectionOut = terminals["list input"]["output"] as OutputCollectionTerminal;
+        const simpleDataOut = terminals["data input"]["output"] as OutputTerminal;
+        const dataIn = terminals["simple data"]["input"] as InputTerminal;
+        const dataOut = terminals["simple data"]["out_file1"] as OutputTerminal;
+        const dataInTwo = terminals["simple data 2"]["input"] as InputTerminal;
+        dataIn.connect(collectionOut);
+        dataInTwo.connect(dataOut);
+        expect(dataIn.mapOver).toEqual({ collectionType: "list", isCollection: true, rank: 1 });
+        //
+        dataIn.disconnect(collectionOut);
+        // this is weird and not particularly robust, if you save and reload this will most likely not be constrained
+        // TODO: avoid this if possible ...
+        expect(dataIn.mapOver).toEqual({ collectionType: "list", isCollection: true, rank: 1 });
+        expect(dataIn.canAccept(simpleDataOut).canAccept).toBe(false);
+        expect(dataIn.canAccept(simpleDataOut).reason).toBe(
+            "Cannot attach non-collection outputs to mapped over inputs, consider disconnecting inputs and outputs to reset this input's mapping."
+        );
+    });
+    // TODO: test mapOver reset when constraint removed
+    it("resets mapOver when constraint is lifted", () => {
+        const collectionOut = terminals["list input"]["output"] as OutputCollectionTerminal;
+        const dataIn = terminals["simple data"]["input"] as InputTerminal;
+        const dataOut = terminals["simple data"]["out_file1"] as OutputTerminal;
+        const dataInTwo = terminals["simple data 2"]["input"] as InputTerminal;
+        dataIn.connect(collectionOut);
+        dataInTwo.connect(dataOut);
+        expect(dataIn.mapOver).toEqual({ collectionType: "list", isCollection: true, rank: 1 });
+        //
+        dataIn.disconnect(collectionOut);
+        // this is weird and not particularly robust, if you save and reload this will most likely not be constrained
+        // TODO: avoid this if possible ...
+        expect(dataIn.mapOver).toEqual({ collectionType: "list", isCollection: true, rank: 1 });
+        dataInTwo.disconnect(dataOut);
+        expect(dataIn.mapOver).toEqual(NULL_COLLECTION_TYPE_DESCRIPTION);
+    });
+    it("rejects connecting incompatible connection types", () => {
+        const pairedOut = terminals["paired input"]["output"] as OutputCollectionTerminal;
+        const collectionIn = terminals["list collection input"]["input1"] as InputCollectionTerminal;
+        expect(collectionIn.canAccept(pairedOut).canAccept).toBe(false);
+        expect(collectionIn.canAccept(pairedOut).reason).toBe("Incompatible collection type(s) for attachment.");
+    });
+    it("rejects mapping over collection input if other inputs have an incompatible map over collection type", () => {
+        const collectionOut = terminals["list input"]["output"] as OutputCollectionTerminal;
+        const listListOut = terminals["list:list input"]["output"] as OutputCollectionTerminal;
+        const listOneIn = terminals["two list inputs"]["kind|f1"] as InputCollectionTerminal;
+        const listTwoIn = terminals["two list inputs"]["kind|f2"] as InputCollectionTerminal;
+        listOneIn.connect(listListOut);
+        expect(listTwoIn.canAccept(collectionOut).canAccept).toBe(false);
+        expect(listTwoIn.canAccept(collectionOut).reason).toBe(
+            "Can't map over this input with output collection type - other inputs have an incompatible map over collection type. Disconnect inputs (and potentially outputs) and retry."
+        );
+    });
+    it("rejects mapping over collection input if outputs constrain input to incompatible collection type", () => {
+        const collectionOut = terminals["list input"]["output"] as OutputCollectionTerminal;
+        const listListOut = terminals["list:list input"]["output"] as OutputCollectionTerminal;
+        const listOneIn = terminals["two list inputs"]["kind|f1"] as InputCollectionTerminal;
+        const listTwoIn = terminals["two list inputs"]["kind|f2"] as InputCollectionTerminal;
+        const mapOverOut = terminals["two list inputs"]["out1"] as OutputTerminal;
+        const dataIn = terminals["simple data"]["input"] as InputTerminal;
+        listOneIn.connect(listListOut);
+        dataIn.connect(mapOverOut);
+        listOneIn.disconnect(listListOut);
+        // TODO: this should be possible eventually IMHO
+        expect(listTwoIn.canAccept(collectionOut).canAccept).toBe(false);
+        expect(listTwoIn.canAccept(collectionOut).reason).toBe(
+            "Can't map over this input with output collection type - this step has outputs defined constraining the mapping of this tool. Disconnect outputs and retry."
+        );
+    });
+    it("tracks transitive map over", () => {
+        const collectionOut = terminals["list:list input"]["output"] as OutputCollectionTerminal;
+        const listListListOut = terminals["list:list:list input"]["output"] as OutputCollectionTerminal;
+        const dataIn = terminals["simple data"]["input"] as InputTerminal;
+        const simpleDataOut = terminals["simple data"]["out_file1"] as OutputTerminal;
+        dataIn.connect(collectionOut);
+        expect(dataIn.mapOver).toEqual({ collectionType: "list:list", isCollection: true, rank: 2 });
+        const otherDataIn = terminals["multi data"]["f1"] as InputTerminal;
+        expect(otherDataIn.canAccept(simpleDataOut).canAccept).toBe(true);
+        otherDataIn.connect(simpleDataOut);
+        expect(otherDataIn.mapOver).toEqual({ collectionType: "list", isCollection: true, rank: 1 });
+        const otherDataInTwo = terminals["multi data"]["f2"] as InputTerminal;
+        expect(otherDataInTwo.canAccept(collectionOut).canAccept).toBe(true);
+        expect(otherDataInTwo.canAccept(listListListOut).canAccept).toBe(false);
+        expect(otherDataInTwo.canAccept(listListListOut).reason).toBe(
+            "Can't map over this input with output collection type - other inputs have an incompatible map over collection type. Disconnect inputs (and potentially outputs) and retry."
+        );
+    });
+    it("tracks transitive map over through collection inputs", () => {
+        const collectionOut = terminals["list:list input"]["output"] as OutputCollectionTerminal;
+        const collectionIn = terminals["list collection input"]["input1"] as InputCollectionTerminal;
+        expect(collectionIn.canAccept(collectionOut).canAccept).toBe(true);
+        collectionIn.connect(collectionOut);
+        expect(collectionIn.mapOver).toEqual({ collectionType: "list", isCollection: true, rank: 1 });
+        const intermediateOut = terminals["list collection input"]["out_file1"] as OutputCollectionTerminal;
+        const otherListIn = terminals["list collection input 2"]["input1"] as InputCollectionTerminal;
+        expect(otherListIn.canAccept(intermediateOut).canAccept).toBe(true);
+        otherListIn.connect(intermediateOut);
+        expect(otherListIn.mapOver).toEqual(NULL_COLLECTION_TYPE_DESCRIPTION);
+    });
+    it("rejects connections to input collection constrained by output connection", () => {
+        const collectionOut = terminals["list input"]["output"] as OutputCollectionTerminal;
+        const collectionIn = terminals["list collection input"]["input1"] as InputCollectionTerminal;
+        const dataIn = terminals["simple data"]["input"] as InputTerminal;
+        const mappedOverListOut = terminals["list collection input"]["out_file1"] as OutputCollectionTerminal;
+        const listListOut = terminals["list:list input"]["output"] as OutputCollectionTerminal;
+        // This constrains collectionIn to list because it's output is mapped over
+        dataIn.connect(mappedOverListOut);
+        collectionIn.connect(collectionOut);
+        // Constraint survives disconnect
+        collectionIn.disconnect(collectionOut);
+        // Can't connect list:list because output acts like "list""
+        expect(collectionIn.canAccept(listListOut).canAccept).toBe(false);
+        expect(collectionIn.canAccept(listListOut).reason).toBe(
+            "Can't map over this input with output collection type - this step has outputs defined constraining the mapping of this tool. Disconnect outputs and retry."
+        );
+    });
+    it("rejects connections to input collection constrained by other input", () => {
+        const collectionOut = terminals["list input"]["output"] as OutputCollectionTerminal;
+        const dataIn = terminals["simple data"]["input"] as InputTerminal;
+        const listOneIn = terminals["two list inputs"]["kind|f1"] as InputCollectionTerminal;
+        const listTwoIn = terminals["two list inputs"]["kind|f2"] as InputCollectionTerminal;
+        const mapOverOut = terminals["two list inputs"]["out1"] as OutputTerminal;
+        const listListOut = terminals["list:list input"]["output"] as OutputCollectionTerminal;
+        // This constrains "two list inputs" to list:list because it's output is mapped over
+        listOneIn.connect(listListOut);
+        dataIn.connect(mapOverOut);
+        // Can't connect list as output acts like "list:list"
+        expect(listTwoIn.canAccept(collectionOut).canAccept).toBe(false);
+        expect(listTwoIn.canAccept(collectionOut).reason).toBe(
+            "Can't map over this input with output collection type - other inputs have an incompatible map over collection type. Disconnect inputs (and potentially outputs) and retry."
+        );
+    });
+    it("disconnects invalid input terminals", () => {
+        const dataOut = terminals["simple data"]["out_file1"] as OutputTerminal;
+        const dataIn = terminals["simple data 2"]["input"] as InputTerminal;
+        dataIn.connect(dataOut);
+        const oldStep = stepStore.getStep(dataOut.stepId);
+        const stepOutput = oldStep.outputs[0] as DataOutput;
+        stepOutput["extensions"] = ["ab1"];
+        dataOut.datatypes = ["ab1"];
+        dataOut.destroyInvalidConnections();
+        expect(connectionStore.connections).toEqual([]);
+        // disconnects and connection will be invalid
+        expect(dataIn.canAccept(dataOut).canAccept).toBe(false);
+        expect(dataIn.canAccept(dataOut).reason).toBe(
+            "Effective output data type(s) [ab1] do not appear to match input type(s) [txt]."
+        );
+    });
+    it("disconnects invalid output terminals", () => {
+        const dataOut = terminals["simple data"]["out_file1"] as OutputTerminal;
+        const dataIn = terminals["simple data 2"]["input"] as InputTerminal;
+        dataIn.connect(dataOut);
+        dataIn.datatypes = ["ab1"];
+        dataIn.destroyInvalidConnections();
+        expect(connectionStore.connections).toEqual([]);
+        // disconnects and connection will be invalid
+        expect(dataIn.canAccept(dataOut).canAccept).toBe(false);
+        expect(dataIn.canAccept(dataOut).reason).toBe(
+            "Effective output data type(s) [tabular] do not appear to match input type(s) [ab1]."
+        );
+    });
+});
+
+describe("Input terminal", () => {
+    let stepStore: ReturnType<typeof useWorkflowStepStore>;
+    let connectionStore: ReturnType<typeof useConnectionStore>;
+    let terminals: { [index: number]: { [index: string]: ReturnType<typeof terminalFactory> } };
+    beforeEach(() => {
+        setActivePinia(createPinia());
+        stepStore = useWorkflowStepStore();
+        connectionStore = useConnectionStore();
+        terminals = {};
+        Object.values(simpleSteps).map((step) => {
+            stepStore.addStep(step);
+            terminals[step.id] = {};
+            const stepTerminals = terminals[step.id];
+            step.inputs?.map((input) => {
+                stepTerminals[input.name] = terminalFactory(step.id, input, testDatatypesMapper);
+            });
+            step.outputs?.map((output) => {
+                stepTerminals[output.name] = terminalFactory(step.id, output, testDatatypesMapper);
+            });
+        });
+    });
+
+    it("has step", () => {
+        expect(stepStore.getStep(1)).toEqual(simpleSteps["1"]);
+    });
+    it("infers correct state", () => {
+        const firstInputTerminal = terminals[1]["input"] as InputTerminal;
+        expect(firstInputTerminal).toBeInstanceOf(InputTerminal);
+        const dataInputOutputTerminal = terminals[0]["output"] as OutputTerminal;
+        expect(dataInputOutputTerminal).toBeInstanceOf(OutputTerminal);
+        expect(firstInputTerminal.connections.length).toBe(1);
+        expect(firstInputTerminal.mapOver).toBe(NULL_COLLECTION_TYPE_DESCRIPTION);
+        expect(firstInputTerminal.isMappedOver()).toBe(false);
+        expect(firstInputTerminal.hasConnectedMappedInputTerminals()).toBe(false);
+        expect(firstInputTerminal.hasMappedOverInputTerminals()).toBe(false);
+        expect(firstInputTerminal.hasConnectedOutputTerminals()).toBe(false);
+        const canAccept = firstInputTerminal.canAccept(dataInputOutputTerminal);
+        expect(canAccept.canAccept).toBe(false);
+        expect(canAccept.reason).toBe(
+            "Input already filled with another connection, delete it before connecting another output."
+        );
+        // bypasses _inputFilled check
+        expect(firstInputTerminal.attachable(dataInputOutputTerminal).canAccept).toBe(true);
+        expect(firstInputTerminal.connected()).toBe(true);
+        expect(firstInputTerminal._collectionAttached()).toBe(false);
+        expect(firstInputTerminal._producesAcceptableDatatype(dataInputOutputTerminal).canAccept).toBe(true);
+    });
+    it("can accept new connection", () => {
+        const firstInputTerminal = terminals[1]["input"] as InputTerminal;
+        const dataInputOutputTerminal = terminals[0]["output"] as OutputTerminal;
+        const connection = firstInputTerminal.connections[0];
+        expect(firstInputTerminal.canAccept(dataInputOutputTerminal).canAccept).toBe(false);
+        expect(dataInputOutputTerminal.validInputTerminals().length).toBe(0);
+        firstInputTerminal.disconnect(connection);
+        expect(firstInputTerminal.canAccept(dataInputOutputTerminal).canAccept).toBe(true);
+        expect(dataInputOutputTerminal.validInputTerminals().length).toBe(1);
+        connectionStore.addConnection(connection);
+        expect(firstInputTerminal.canAccept(dataInputOutputTerminal).canAccept).toBe(false);
+    });
+});
+
+describe("producesAcceptableDatatype", () => {
+    it("accepts everything if datatypes includes input", () => {
+        expect(producesAcceptableDatatype(testDatatypesMapper, ["input"], ["whatever"]).canAccept).toBe(true);
+    });
+    it("rejects connections for unknown output datatypes", () => {
+        expect(producesAcceptableDatatype(testDatatypesMapper, ["txt"], ["i am not an extension"]).canAccept).toBe(
+            false
+        );
+        expect(producesAcceptableDatatype(testDatatypesMapper, ["txt"], ["i am not an extension"]).reason).toBe(
+            "Effective output data type(s) [i am not an extension] unknown. This tool cannot be run on this Galaxy Server at this moment, please contact the Administrator."
+        );
+    });
+    it("rejects incompatible datatypes", () => {
+        expect(producesAcceptableDatatype(testDatatypesMapper, ["txt"], ["ab1"]).canAccept).toBe(false);
+        expect(producesAcceptableDatatype(testDatatypesMapper, ["txt"], ["ab1"]).reason).toBe(
+            "Effective output data type(s) [ab1] do not appear to match input type(s) [txt]."
+        );
+    });
+});
diff --git a/client/src/components/Workflow/Editor/modules/terminals.ts b/client/src/components/Workflow/Editor/modules/terminals.ts
new file mode 100644
index 00000000000..fdcebf890ce
--- /dev/null
+++ b/client/src/components/Workflow/Editor/modules/terminals.ts
@@ -0,0 +1,722 @@
+import { useConnectionStore } from "@/stores/workflowConnectionStore";
+import { Connection } from "@/stores/workflowConnectionStore";
+import EventEmitter from "events";
+import {
+    NULL_COLLECTION_TYPE_DESCRIPTION,
+    ANY_COLLECTION_TYPE_DESCRIPTION,
+    CollectionTypeDescription,
+    type CollectionTypeDescriptor,
+} from "./collectionTypeDescription";
+import { useWorkflowStepStore } from "@/stores/workflowStepStore";
+import type {
+    DataStepInput,
+    DataOutput,
+    CollectionOutput,
+    ParameterOutput,
+    DataCollectionStepInput,
+    ParameterStepInput,
+    TerminalSource,
+} from "@/stores/workflowStepStore";
+import type { DatatypesMapperModel } from "@/components/Datatypes/model";
+
+class ConnectionAcceptable {
+    reason: string | null;
+    canAccept: boolean;
+    constructor(canAccept: boolean, reason: string | null) {
+        this.canAccept = canAccept;
+        this.reason = reason;
+    }
+}
+
+interface BaseTerminalArgs {
+    name: string;
+    stepId: number;
+    datatypesMapper: DatatypesMapperModel;
+}
+
+interface InputTerminalInputs {
+    datatypes: string[];
+    multiple: boolean;
+    optional: boolean;
+}
+
+interface InputTerminalArgs extends BaseTerminalArgs {
+    input: InputTerminalInputs;
+}
+
+class Terminal extends EventEmitter {
+    connectionStore: ReturnType<typeof useConnectionStore>;
+    stepStore: ReturnType<typeof useWorkflowStepStore>;
+    name: string;
+    multiple: boolean;
+    stepId: number;
+    terminalType: "input" | "output";
+    datatypesMapper: DatatypesMapperModel;
+
+    constructor(attr: BaseTerminalArgs) {
+        super();
+        this.connectionStore = useConnectionStore();
+        this.stepStore = useWorkflowStepStore();
+        this.stepId = attr.stepId;
+        this.name = attr.name;
+        this.multiple = false;
+        this.terminalType = "input";
+        this.datatypesMapper = attr.datatypesMapper;
+    }
+    public get id() {
+        return `node-${this.stepId}-${this.terminalType}-${this.name}`;
+    }
+    public get connections(): Connection[] {
+        return this.connectionStore.getConnectionsForTerminal(this.id);
+    }
+    public get mapOver(): CollectionTypeDescriptor {
+        return this.stepStore.stepMapOver[this.stepId] || NULL_COLLECTION_TYPE_DESCRIPTION;
+    }
+    connect(other: Terminal) {
+        const connection = new Connection(
+            { stepId: this.stepId, name: this.name, connectorType: "input" },
+            { stepId: other.stepId, name: other.name, connectorType: "output" }
+        );
+        this.connectionStore.addConnection(connection);
+    }
+    disconnect(other: BaseOutputTerminal | Connection) {
+        let connection: Connection;
+        if (other instanceof Terminal) {
+            connection = new Connection(
+                { stepId: this.stepId, name: this.name, connectorType: "input" },
+                { stepId: other.stepId, name: other.name, connectorType: "output" }
+            );
+        } else {
+            connection = other;
+        }
+        this.connectionStore.removeConnection(connection.id);
+        this.resetMappingIfNeeded(connection);
+    }
+    setMapOver(val: CollectionTypeDescriptor) {
+        let outputVal = val;
+        if (this.multiple) {
+            // emulate list input
+            const description = new CollectionTypeDescription("list");
+            if (val.collectionType === description.collectionType) {
+                // No mapping over necessary
+                return;
+            }
+            outputVal = val.effectiveMapOver(description);
+        }
+        const effectiveMapOver = this._effectiveMapOver(outputVal);
+        if (!this.mapOver.equal(effectiveMapOver)) {
+            this.stepStore.changeStepMapOver(this.stepId, effectiveMapOver);
+            // TODO: do we even need to listen for this?
+            this.emit("changeMapOver", outputVal);
+        }
+    }
+    _effectiveMapOver(otherCollectionType: CollectionTypeDescriptor) {
+        return otherCollectionType;
+    }
+    isMappedOver(): boolean {
+        return Boolean(this.mapOver.isCollection);
+    }
+    resetMapping(connection?: Connection) {
+        this.stepStore.changeStepMapOver(this.stepId, NULL_COLLECTION_TYPE_DESCRIPTION);
+        // necessary ?
+        this.emit("changeMapOver", this.mapOver);
+    }
+    hasConnectedMappedInputTerminals() {
+        // check if step has connected and mapped input terminals ... should maybe be on step/node ?
+        const connections = this.connectionStore.getConnectionsForStep(this.stepId);
+        return connections.some(
+            (connection) =>
+                connection.input.stepId === this.stepId && this.stepStore.stepMapOver[this.stepId]?.collectionType
+        );
+    }
+    _getOutputConnections() {
+        return this.connectionStore.getConnectionsForStep(this.stepId).filter((connection) => {
+            return connection.output.stepId === this.stepId;
+        });
+    }
+    hasConnectedOutputTerminals() {
+        // Does this step/node have connected connections
+        return this._getOutputConnections().length > 0;
+    }
+    hasMappedOverInputTerminals() {
+        return Boolean(this.stepStore.stepMapOver[this.stepId]?.collectionType);
+    }
+    resetMappingIfNeeded(connection?: Connection) {
+        const mapOver = this.mapOver;
+        if (!mapOver.isCollection) {
+            return;
+        }
+        // No output terminals are counting on this being mapped
+        // over if connected inputs are still mapped over or if none
+        // of the outputs are connected...
+        const reset = this.hasConnectedMappedInputTerminals() || !this.hasConnectedOutputTerminals();
+        if (reset) {
+            this.resetMapping(connection);
+        }
+    }
+}
+
+class BaseInputTerminal extends Terminal {
+    datatypes: InputTerminalInputs["datatypes"];
+    optional: InputTerminalInputs["optional"];
+
+    constructor(attr: InputTerminalArgs) {
+        super(attr);
+        this.datatypes = attr.input.datatypes;
+        this.multiple = attr.input.multiple;
+        this.optional = attr.input.optional;
+    }
+    connect(other: BaseOutputTerminal): void {
+        super.connect(other);
+        this.setDefaultMapOver(other);
+    }
+    setDefaultMapOver(other: BaseOutputTerminal) {
+        const otherCollectionType = this._otherCollectionType(other);
+        if (otherCollectionType.isCollection) {
+            this.setMapOver(otherCollectionType);
+        }
+    }
+    canAccept(outputTerminal: BaseOutputTerminal) {
+        if (this.stepId == outputTerminal.stepId) {
+            return new ConnectionAcceptable(false, "Cannot connection output to input of same step.");
+        }
+        if (this._inputFilled()) {
+            return new ConnectionAcceptable(
+                false,
+                "Input already filled with another connection, delete it before connecting another output."
+            );
+        } else {
+            return this.attachable(outputTerminal);
+        }
+    }
+    attachable(terminal: BaseOutputTerminal): ConnectionAcceptable {
+        // TODO: provide through Mixin
+        throw "Subclass needs to implement this";
+    }
+    _getOutputStepsMapOver() {
+        const connections = this._getOutputConnections();
+        const connectedStepIds = Array.from(new Set(connections.map((connection) => connection.output.stepId)));
+        return connectedStepIds.map((stepId) => this.stepStore.stepMapOver[stepId] || NULL_COLLECTION_TYPE_DESCRIPTION);
+    }
+    resetMapping(connection?: Connection) {
+        super.resetMapping(connection);
+        const outputStepIds = this._getOutputTerminals().map((outputTerminal) => outputTerminal.stepId);
+        if (connection) {
+            outputStepIds.push(connection.output.stepId);
+        }
+        Array.from(new Set(outputStepIds)).forEach((stepId) => {
+            const step = this.stepStore.getStep(stepId);
+            // step must have an output, since it is or was connected to this step
+            const terminalSource = step.outputs[0];
+            if (terminalSource) {
+                const terminal = terminalFactory(step.id, terminalSource, this.datatypesMapper);
+                terminal.resetMappingIfNeeded();
+            }
+        });
+    }
+    _getOutputTerminals() {
+        return this.connectionStore.getOutputTerminalsForInputTerminal(this.id);
+    }
+    _getFirstOutputTerminal() {
+        const outputTerminals = this._getOutputTerminals();
+        if (outputTerminals.length > 0) {
+            return outputTerminals[0];
+        }
+        return null;
+    }
+    connected() {
+        return Boolean(this._getFirstOutputTerminal());
+    }
+    _inputFilled() {
+        let inputFilled: boolean;
+        if (!this.connected()) {
+            inputFilled = false;
+        } else {
+            if (this.multiple) {
+                // Can only attach one collection to multiple input
+                // data parameter.
+                inputFilled = !!this._collectionAttached();
+            } else {
+                inputFilled = true;
+            }
+        }
+        return inputFilled;
+    }
+    _collectionAttached() {
+        const outputTerminals = this._getOutputTerminals();
+        return outputTerminals.some((outputTerminal) => {
+            const output = this.stepStore
+                .getStep(outputTerminal.stepId)
+                .outputs.find((output) => output.name == outputTerminal.name);
+
+            if (
+                output &&
+                (("collection" in output && output.collection) ||
+                    this.stepStore.stepMapOver[outputTerminal.stepId]?.isCollection ||
+                    ("extensions" in output && output.extensions.indexOf("input") > 0))
+            ) {
+                return true;
+            }
+        });
+    }
+    _mappingConstraints() {
+        // If this is a connected terminal, return list of collection types
+        // other terminals connected to node are constraining mapping to.
+        if (this.mapOver.isCollection) {
+            return [this.mapOver];
+        }
+        return this._getOutputStepsMapOver();
+    }
+    _producesAcceptableDatatype(other: BaseOutputTerminal) {
+        // other is a non-collection output...
+
+        if (other instanceof OutputParameterTerminal) {
+            return new ConnectionAcceptable(false, "Cannot connect workflow parameter to data input.");
+        }
+        return producesAcceptableDatatype(this.datatypesMapper, this.datatypes, other.datatypes);
+    }
+    _producesAcceptableDatatypeAndOptionalness(other: BaseOutputTerminal) {
+        if (!this.optional && !this.multiple && other.optional) {
+            return new ConnectionAcceptable(false, "Cannot connect an optional output to a non-optional input");
+        }
+        return this._producesAcceptableDatatype(other);
+    }
+    _otherCollectionType(other: BaseOutputTerminal) {
+        let otherCollectionType = NULL_COLLECTION_TYPE_DESCRIPTION;
+        if (other.isCollection && other.collectionType) {
+            otherCollectionType = other.collectionType;
+        }
+        const otherMapOver = other.mapOver;
+        if (otherMapOver.isCollection) {
+            otherCollectionType = otherMapOver.append(otherCollectionType);
+        }
+        return otherCollectionType;
+    }
+    getConnectedTerminals() {
+        return this.connections.map((connection) => {
+            const outputStep = this.stepStore.getStep(connection.output.stepId);
+            let terminalSource = outputStep.outputs.find((output) => output.name === connection.output.name);
+            if (!terminalSource) {
+                /*
+                / This can't happen, I think, because we'd drop the connection.
+                / We (probably) want to eventually display invalid connections,
+                / so maybe generate a NullTerminal when there is no terminalSource ?
+                */
+                throw `Could not find output ${connection.output.name} on step ${connection.output.stepId}`;
+            }
+            const postJobActionKey = `ChangeDatatypeAction${connection.output.name}`;
+            if (
+                "extensions" in terminalSource &&
+                outputStep.post_job_actions &&
+                postJobActionKey in outputStep.post_job_actions
+            ) {
+                terminalSource = {
+                    ...terminalSource,
+                    extensions: [outputStep.post_job_actions[postJobActionKey].action_arguments.newtype],
+                };
+            }
+            return terminalFactory(outputStep.id, terminalSource, this.datatypesMapper);
+        });
+    }
+    destroyInvalidConnections() {
+        this.getConnectedTerminals().forEach((terminal) => {
+            if (!this.attachable(terminal).canAccept) {
+                this.disconnect(terminal);
+            }
+        });
+    }
+}
+
+// TODO: turn into InputTerminalAttachableMixin ?
+export class InputTerminal extends BaseInputTerminal {
+    collection: boolean;
+
+    constructor(attr: InputTerminalArgs) {
+        super(attr);
+        this.collection = false;
+        this.getConnectedTerminals().map((other) => this.setDefaultMapOver(other));
+    }
+
+    attachable(other: BaseOutputTerminal) {
+        const otherCollectionType = this._otherCollectionType(other);
+        const mapOver = this.mapOver;
+        if (otherCollectionType.isCollection) {
+            if (this.multiple) {
+                if (this.connected() && !this._collectionAttached()) {
+                    return new ConnectionAcceptable(
+                        false,
+                        "Cannot attach collections to data parameters with individual data inputs already attached."
+                    );
+                }
+                if (otherCollectionType.collectionType && otherCollectionType.collectionType.endsWith("paired")) {
+                    return new ConnectionAcceptable(
+                        false,
+                        "Cannot attach paired inputs to multiple data parameters, only lists may be treated this way."
+                    );
+                }
+            }
+            if (mapOver.isCollection && mapOver.canMatch(otherCollectionType)) {
+                return this._producesAcceptableDatatypeAndOptionalness(other);
+            } else if (
+                this.multiple &&
+                new CollectionTypeDescription("list").append(this.mapOver).canMatch(otherCollectionType)
+            ) {
+                // This handles the special case of a list input being connected to a multiple="true" data input.
+                // Nested lists would be correctly mapped over by the above condition.
+                return this._producesAcceptableDatatypeAndOptionalness(other);
+            } else {
+                //  Need to check if this would break constraints...
+                const mappingConstraints = this._mappingConstraints();
+                if (mappingConstraints.every(otherCollectionType.canMatch.bind(otherCollectionType))) {
+                    return this._producesAcceptableDatatypeAndOptionalness(other);
+                } else {
+                    if (mapOver.isCollection) {
+                        // incompatible collection type attached
+                        if (this.hasConnectedMappedInputTerminals()) {
+                            return new ConnectionAcceptable(
+                                false,
+                                "Can't map over this input with output collection type - other inputs have an incompatible map over collection type. Disconnect inputs (and potentially outputs) and retry."
+                            );
+                        } else {
+                            return new ConnectionAcceptable(
+                                false,
+                                "Can't map over this input with output collection type - this step has outputs defined constraining the mapping of this tool. Disconnect outputs and retry."
+                            );
+                        }
+                    } else {
+                        return new ConnectionAcceptable(
+                            false,
+                            "Can't map over this input with output collection type - an output of this tool is mapped over constraining this input. Disconnect output(s) and retry."
+                        );
+                    }
+                }
+            }
+        } else if (mapOver.isCollection) {
+            return new ConnectionAcceptable(
+                false,
+                "Cannot attach non-collection outputs to mapped over inputs, consider disconnecting inputs and outputs to reset this input's mapping."
+            );
+        }
+        return this._producesAcceptableDatatypeAndOptionalness(other);
+    }
+}
+
+interface InputParameterTerminalArgs extends InputTerminalArgs {
+    type: ParameterStepInput["type"];
+}
+
+export class InputParameterTerminal extends BaseInputTerminal {
+    type: ParameterStepInput["type"];
+
+    constructor(attr: InputParameterTerminalArgs) {
+        super(attr);
+        this.type = attr.type;
+        this.getConnectedTerminals().map((other) => this.setDefaultMapOver(other));
+    }
+
+    effectiveType(parameterType: string) {
+        return parameterType == "select" ? "text" : parameterType;
+    }
+    attachable(other: BaseOutputTerminal) {
+        const effectiveThisType = this.effectiveType(this.type);
+        const otherType = ("type" in other && other.type) || "data";
+        const effectiveOtherType = this.effectiveType(otherType);
+        return new ConnectionAcceptable(
+            effectiveThisType == effectiveOtherType,
+            `Cannot attach a ${effectiveOtherType} parameter to a ${effectiveThisType} input`
+        );
+    }
+}
+
+interface InputCollectionTerminalArgs extends InputTerminalArgs {
+    collection_types: string[] | null;
+}
+
+export class InputCollectionTerminal extends BaseInputTerminal {
+    collection: boolean;
+    collectionTypes: CollectionTypeDescriptor[];
+
+    constructor(attr: InputCollectionTerminalArgs) {
+        super(attr);
+        this.multiple = false;
+        this.collection = true;
+        this.collectionTypes = attr.collection_types
+            ? attr.collection_types.map((collectionType) => new CollectionTypeDescription(collectionType))
+            : [];
+        if (!this.collectionTypes.length) {
+            this.collectionTypes.push(ANY_COLLECTION_TYPE_DESCRIPTION);
+        }
+        this.getConnectedTerminals().map((other) => this.setDefaultMapOver(other));
+    }
+    _effectiveMapOver(otherCollectionType: CollectionTypeDescriptor) {
+        const collectionTypes = this.collectionTypes;
+        const canMatch = collectionTypes.some((collectionType) => collectionType.canMatch(otherCollectionType));
+        if (!canMatch) {
+            for (const collectionTypeIndex in collectionTypes) {
+                const collectionType = collectionTypes[collectionTypeIndex];
+                if (otherCollectionType.canMapOver(collectionType)) {
+                    const effectiveMapOver = otherCollectionType.effectiveMapOver(collectionType);
+                    if (effectiveMapOver != NULL_COLLECTION_TYPE_DESCRIPTION) {
+                        return effectiveMapOver;
+                    }
+                }
+            }
+        }
+        return NULL_COLLECTION_TYPE_DESCRIPTION;
+    }
+    _effectiveCollectionTypes() {
+        return this.collectionTypes.map((t) => this.mapOver.append(t));
+    }
+    attachable(other: BaseOutputTerminal) {
+        const otherCollectionType = this._otherCollectionType(other);
+        if (otherCollectionType.isCollection) {
+            const effectiveCollectionTypes = this._effectiveCollectionTypes();
+            const mapOver = this.mapOver;
+            const canMatch = effectiveCollectionTypes.some((effectiveCollectionType) =>
+                effectiveCollectionType.canMatch(otherCollectionType)
+            );
+            if (canMatch) {
+                // Only way a direct match...
+                return this._producesAcceptableDatatypeAndOptionalness(other);
+                // Otherwise we need to mapOver
+            } else if (mapOver.isCollection) {
+                // In this case, mapOver already set and we didn't match skipping...
+                if (this.hasConnectedMappedInputTerminals()) {
+                    return new ConnectionAcceptable(
+                        false,
+                        "Can't map over this input with output collection type - other inputs have an incompatible map over collection type. Disconnect inputs (and potentially outputs) and retry."
+                    );
+                } else {
+                    return new ConnectionAcceptable(
+                        false,
+                        "Can't map over this input with output collection type - this step has outputs defined constraining the mapping of this tool. Disconnect outputs and retry."
+                    );
+                }
+            } else if (this.collectionTypes.some((collectionType) => otherCollectionType.canMapOver(collectionType))) {
+                // we're not mapped over - but hey maybe we could be... lets check.
+                const effectiveMapOver = this._effectiveMapOver(otherCollectionType);
+                //  Need to check if this would break constraints...
+                const mappingConstraints = this._mappingConstraints();
+                if (mappingConstraints.every((d) => effectiveMapOver.canMatch(d))) {
+                    return this._producesAcceptableDatatypeAndOptionalness(other);
+                } else {
+                    return new ConnectionAcceptable(
+                        false,
+                        "Can't map over this input with output collection type - this step has outputs defined constraining the mapping of this tool. Disconnect outputs and retry."
+                    );
+                }
+            } else {
+                return new ConnectionAcceptable(false, "Incompatible collection type(s) for attachment.");
+            }
+        } else {
+            return new ConnectionAcceptable(false, "Cannot attach a data output to a collection input.");
+        }
+    }
+}
+
+interface BaseOutputTerminalArgs extends BaseTerminalArgs {
+    datatypes: string[];
+    optional: boolean;
+}
+
+class BaseOutputTerminal extends Terminal {
+    datatypes: BaseOutputTerminalArgs["datatypes"];
+    optional: BaseOutputTerminalArgs["optional"];
+    isCollection?: boolean;
+    collectionType?: CollectionTypeDescriptor;
+    type?: string;
+
+    constructor(attr: BaseOutputTerminalArgs) {
+        super(attr);
+        this.datatypes = attr.datatypes;
+        this.optional = attr.optional;
+        this.terminalType = "output";
+    }
+    getConnectedTerminals() {
+        return this.connections.map((connection) => {
+            const inputStep = this.stepStore.getStep(connection.input.stepId);
+            const terminalSource = inputStep.inputs.find((input) => input.name === connection.input.name);
+            if (!terminalSource) {
+                throw `Could not find input ${connection.input.name} on step ${connection.input.stepId}`;
+            }
+            return terminalFactory(inputStep.id, terminalSource, this.datatypesMapper);
+        });
+    }
+    destroyInvalidConnections() {
+        this.getConnectedTerminals().forEach((terminal) => {
+            if (!terminal.attachable(this).canAccept) {
+                terminal.disconnect(this);
+            }
+        });
+    }
+    validInputTerminals() {
+        const validInputTerminals: InputTerminals[] = [];
+        Object.values(this.stepStore.steps).map((step) => {
+            step.inputs?.forEach((input) => {
+                const inputTerminal = terminalFactory(step.id, input, this.datatypesMapper);
+                if (inputTerminal.canAccept(this).canAccept) {
+                    validInputTerminals.push(inputTerminal);
+                }
+            });
+        });
+        return validInputTerminals;
+    }
+}
+
+export class OutputTerminal extends BaseOutputTerminal {}
+
+interface OutputCollectionTerminalArgs extends BaseOutputTerminalArgs {
+    collection_type: string;
+    collection_type_source: string | null;
+}
+
+export class OutputCollectionTerminal extends BaseOutputTerminal {
+    constructor(attr: OutputCollectionTerminalArgs) {
+        super(attr);
+        if (attr.collection_type) {
+            this.collectionType = new CollectionTypeDescription(attr.collection_type);
+        } else {
+            const collectionTypeSource = attr.collection_type_source;
+            if (!collectionTypeSource) {
+                console.log("Warning: No collection type or collection type source defined.");
+            }
+            this.collectionType = ANY_COLLECTION_TYPE_DESCRIPTION;
+        }
+        this.isCollection = true;
+    }
+}
+
+interface OutputParameterTerminalArgs extends Omit<BaseOutputTerminalArgs, "datatypes"> {
+    type: ParameterOutput["type"];
+}
+
+export class OutputParameterTerminal extends BaseOutputTerminal {
+    constructor(attr: OutputParameterTerminalArgs) {
+        super({ ...attr, datatypes: [] });
+        this.type = attr.type;
+    }
+}
+
+export type OutputTerminals = OutputTerminal | OutputCollectionTerminal | OutputParameterTerminal;
+export type InputTerminals = InputTerminal | InputCollectionTerminal | InputParameterTerminal;
+
+export function producesAcceptableDatatype(
+    datatypesMapper: DatatypesMapperModel,
+    inputDatatypes: string[],
+    otherDatatypes: string[]
+) {
+    for (const t in inputDatatypes) {
+        const thisDatatype = inputDatatypes[t];
+        if (thisDatatype == "input") {
+            return new ConnectionAcceptable(true, null);
+        }
+        // FIXME: No idea what to do about case when datatype is 'input'
+        const validMatch = otherDatatypes.some(
+            (otherDatatype) =>
+                otherDatatype == "input" ||
+                otherDatatype == "_sniff_" ||
+                datatypesMapper.isSubType(otherDatatype, thisDatatype)
+        );
+        if (validMatch) {
+            return new ConnectionAcceptable(true, null);
+        }
+    }
+    const datatypesSet = new Set(datatypesMapper.datatypes);
+    const invalidDatatypes = otherDatatypes.filter((datatype) => !datatypesSet.has(datatype));
+    if (invalidDatatypes.length) {
+        return new ConnectionAcceptable(
+            false,
+            `Effective output data type(s) [${invalidDatatypes.join(
+                ", "
+            )}] unknown. This tool cannot be run on this Galaxy Server at this moment, please contact the Administrator.`
+        );
+    }
+    return new ConnectionAcceptable(
+        false,
+        `Effective output data type(s) [${otherDatatypes.join(
+            ", "
+        )}] do not appear to match input type(s) [${inputDatatypes.join(", ")}].`
+    );
+}
+
+type TerminalOf<T extends TerminalSource> = T extends DataStepInput
+    ? InputTerminal
+    : T extends DataCollectionStepInput
+    ? InputCollectionTerminal
+    : T extends ParameterStepInput
+    ? InputParameterTerminal
+    : T extends DataOutput
+    ? OutputTerminal
+    : T extends CollectionOutput
+    ? OutputCollectionTerminal
+    : T extends ParameterOutput
+    ? OutputParameterTerminal
+    : never;
+
+export function terminalFactory<T extends TerminalSource>(
+    stepId: number,
+    terminalSource: T,
+    datatypesMapper: DatatypesMapperModel
+): TerminalOf<T> {
+    if ("input_type" in terminalSource) {
+        const terminalArgs = {
+            datatypesMapper: datatypesMapper,
+            name: terminalSource.name,
+            stepId: stepId,
+        };
+        const inputArgs = {
+            datatypes: terminalSource.extensions,
+            multiple: terminalSource.multiple,
+            optional: terminalSource.optional,
+        };
+        if (terminalSource.input_type == "dataset") {
+            // type cast appears to be necessary: https://github.com/Microsoft/TypeScript/issues/13995
+            return new InputTerminal({
+                ...terminalArgs,
+                input: inputArgs,
+            }) as TerminalOf<T>;
+        } else if (terminalSource.input_type === "dataset_collection") {
+            return new InputCollectionTerminal({
+                ...terminalArgs,
+                collection_types: terminalSource.collection_types,
+                input: {
+                    ...inputArgs,
+                },
+            }) as TerminalOf<T>;
+        } else if (terminalSource.input_type === "parameter") {
+            return new InputParameterTerminal({
+                ...terminalArgs,
+                type: terminalSource.type,
+                input: {
+                    ...inputArgs,
+                },
+            }) as TerminalOf<T>;
+        }
+    } else if (terminalSource.name) {
+        const outputArgs = {
+            name: terminalSource.name,
+            optional: terminalSource.optional,
+            stepId: stepId,
+            datatypesMapper: datatypesMapper,
+        };
+        if ("parameter" in terminalSource) {
+            return new OutputParameterTerminal({
+                ...outputArgs,
+                type: terminalSource.type,
+            }) as TerminalOf<T>;
+        } else if ("collection" in terminalSource && terminalSource.collection) {
+            return new OutputCollectionTerminal({
+                ...outputArgs,
+                datatypes: terminalSource.extensions,
+                collection_type: terminalSource.collection_type,
+                collection_type_source: terminalSource.collection_type_source,
+            }) as TerminalOf<T>;
+        } else {
+            return new OutputTerminal({
+                ...outputArgs,
+                datatypes: terminalSource.extensions,
+            }) as TerminalOf<T>;
+        }
+    }
+    throw `Could not build terminal for ${terminalSource}`;
+}
diff --git a/client/src/components/Workflow/Editor/modules/utilities.js b/client/src/components/Workflow/Editor/modules/utilities.js
index 93eb6800cf3..869f89afa28 100644
--- a/client/src/components/Workflow/Editor/modules/utilities.js
+++ b/client/src/components/Workflow/Editor/modules/utilities.js
@@ -55,19 +55,3 @@ export function getCompatibleRecommendations(predChild, outputDatatypes, datatyp
     }
     return cTools;
 }
-
-export function checkLabels(nodeId, newLabel, nodes) {
-    let duplicate = false;
-    for (const i in nodes) {
-        const n = nodes[i];
-        if (n.label && n.label == newLabel && n.id != nodeId) {
-            duplicate = true;
-            break;
-        }
-    }
-    if (duplicate) {
-        return "Duplicate label. Please fix this before saving the workflow.";
-    } else {
-        return "";
-    }
-}
diff --git a/client/src/components/Workflow/Editor/test-data/parameter_steps.json b/client/src/components/Workflow/Editor/test-data/parameter_steps.json
new file mode 100644
index 00000000000..fb9a9ed0f02
--- /dev/null
+++ b/client/src/components/Workflow/Editor/test-data/parameter_steps.json
@@ -0,0 +1,816 @@
+{
+  "0": {
+    "id": 0,
+    "type": "data_input",
+    "label": "data input",
+    "content_id": null,
+    "name": "Input dataset",
+    "tool_state": {
+      "optional": "\"false\"",
+      "tag": "\"\"",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "output",
+        "extensions": [
+          "input"
+        ],
+        "optional": false
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {},
+    "uuid": "bdfb1f7e-a7b7-4c95-85cb-901abdc6b276",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 34.1439208984375,
+      "top": 0
+    }
+  },
+  "1": {
+    "id": 1,
+    "type": "tool",
+    "label": "simple data",
+    "content_id": "Cut1",
+    "name": "Cut",
+    "tool_state": {
+      "columnList": "\"c1,c2\"",
+      "delimiter": "\"T\"",
+      "input": "{\"__class__\": \"RuntimeValue\"}",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [
+      {
+        "name": "input",
+        "label": "From",
+        "multiple": false,
+        "extensions": [
+          "txt"
+        ],
+        "optional": false,
+        "input_type": "dataset"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "out_file1",
+        "extensions": [
+          "tabular"
+        ],
+        "type": "data",
+        "optional": false
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {
+      "HideDatasetActionout_file1": {
+        "action_type": "HideDatasetAction",
+        "output_name": "out_file1",
+        "action_arguments": {}
+      }
+    },
+    "uuid": "16626ff6-6484-4db2-bffc-71b69ff05b80",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 231.70590209960938,
+      "top": 114.9776840209961
+    }
+  },
+  "2": {
+    "id": 2,
+    "type": "data_collection_input",
+    "label": "list input",
+    "content_id": null,
+    "name": "Input dataset collection",
+    "tool_state": {
+      "collection_type": "\"list\"",
+      "optional": "\"false\"",
+      "tag": "\"\"",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "output",
+        "extensions": [
+          "input"
+        ],
+        "collection": true,
+        "collection_type": "list",
+        "optional": false
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {},
+    "uuid": "62031885-cc80-424b-8ee9-8ba100f04b6d",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 0,
+      "top": 262.0687561035156
+    }
+  },
+  "3": {
+    "id": 3,
+    "type": "data_collection_input",
+    "label": "list:list input",
+    "content_id": null,
+    "name": "Input dataset collection",
+    "tool_state": {
+      "collection_type": "\"list:list\"",
+      "optional": "\"false\"",
+      "tag": "\"\"",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "output",
+        "extensions": [
+          "input"
+        ],
+        "collection": true,
+        "collection_type": "list:list",
+        "optional": false
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {},
+    "uuid": "cecee25d-5c31-445d-8c7a-8f6da48ffc5b",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 7.45245361328125,
+      "top": 386.3525695800781
+    }
+  },
+  "4": {
+    "id": 4,
+    "type": "data_collection_input",
+    "label": "paired input",
+    "content_id": null,
+    "name": "Input dataset collection",
+    "tool_state": {
+      "collection_type": "\"paired\"",
+      "optional": "\"false\"",
+      "tag": "\"\"",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "output",
+        "extensions": [
+          "input"
+        ],
+        "collection": true,
+        "collection_type": "paired",
+        "optional": false
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {},
+    "uuid": "f695dc34-68c8-4df9-a3d4-ef7e17502a53",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 12.8729248046875,
+      "top": 501.7839660644531
+    }
+  },
+  "5": {
+    "id": 5,
+    "type": "parameter_input",
+    "label": "integer parameter input",
+    "content_id": null,
+    "name": "Input parameter",
+    "tool_state": {
+      "parameter_definition": "{\"__current_case__\": 1, \"optional\": {\"__current_case__\": 1, \"optional\": \"false\"}, \"parameter_type\": \"integer\"}",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "output",
+        "label": "integer parameter input",
+        "type": "integer",
+        "optional": false,
+        "parameter": true
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {},
+    "uuid": "634f06f1-b279-4160-9390-a004018e92ce",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 138.72970581054688,
+      "top": 610.5069274902344
+    }
+  },
+  "6": {
+    "id": 6,
+    "type": "tool",
+    "label": "simple data 2",
+    "content_id": "Cut1",
+    "name": "Cut",
+    "tool_state": {
+      "columnList": "\"c1,c2\"",
+      "delimiter": "\"T\"",
+      "input": "{\"__class__\": \"RuntimeValue\"}",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [
+      {
+        "name": "input",
+        "label": "From",
+        "multiple": false,
+        "extensions": [
+          "txt"
+        ],
+        "optional": false,
+        "input_type": "dataset"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "out_file1",
+        "extensions": [
+          "tabular"
+        ],
+        "type": "data",
+        "optional": false
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {
+      "HideDatasetActionout_file1": {
+        "action_type": "HideDatasetAction",
+        "output_name": "out_file1",
+        "action_arguments": {}
+      }
+    },
+    "uuid": "e7457670-84dc-442c-85cf-563ffbcd03bc",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 680.9476928710938,
+      "top": 140.092041015625
+    }
+  },
+  "7": {
+    "id": 7,
+    "type": "tool",
+    "label": "any collection",
+    "content_id": "__APPLY_RULES__",
+    "name": "Apply rules",
+    "tool_state": {
+      "input": "{\"__class__\": \"RuntimeValue\"}",
+      "rules": null,
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [
+      {
+        "name": "input",
+        "label": "Input Collection",
+        "multiple": false,
+        "input_type": "dataset_collection",
+        "collection_types": null,
+        "optional": false,
+        "extensions": [
+          "data"
+        ]
+      }
+    ],
+    "outputs": [
+      {
+        "name": "output",
+        "extensions": [
+          "input"
+        ],
+        "type": "collection",
+        "optional": false,
+        "collection": true,
+        "collection_type": null,
+        "collection_type_source": null
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {
+      "HideDatasetActionoutput": {
+        "action_type": "HideDatasetAction",
+        "output_name": "output",
+        "action_arguments": {}
+      }
+    },
+    "uuid": "8e4a88dd-b7ad-49b5-907d-debeb75e88c0",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 458.40887451171875,
+      "top": 597.1356506347656
+    }
+  },
+  "8": {
+    "id": 8,
+    "type": "tool",
+    "label": "list or paired",
+    "content_id": "__EXTRACT_DATASET__",
+    "name": "Extract dataset",
+    "tool_state": {
+      "input": "{\"__class__\": \"RuntimeValue\"}",
+      "which": "{\"__current_case__\": 0, \"which_dataset\": \"first\"}",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [
+      {
+        "name": "input",
+        "label": "Input List",
+        "multiple": false,
+        "input_type": "dataset_collection",
+        "collection_types": [
+          "list",
+          "paired"
+        ],
+        "optional": false,
+        "extensions": [
+          "data"
+        ]
+      }
+    ],
+    "outputs": [
+      {
+        "name": "output",
+        "extensions": [
+          "data"
+        ],
+        "type": "data",
+        "optional": false,
+        "label": "input dataset(s) (extracted element)"
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {
+      "HideDatasetActionoutput": {
+        "action_type": "HideDatasetAction",
+        "output_name": "output",
+        "action_arguments": {}
+      }
+    },
+    "uuid": "478c0499-d1c7-45d6-b1b5-76030f64c6ad",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 611.2789306640625,
+      "top": 457.7712707519531
+    }
+  },
+  "9": {
+    "id": 9,
+    "type": "data_input",
+    "label": "optional data input",
+    "content_id": null,
+    "name": "Input dataset",
+    "tool_state": {
+      "optional": "\"true\"",
+      "tag": "\"\"",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "output",
+        "extensions": [
+          "input"
+        ],
+        "optional": true
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {},
+    "uuid": "491c1548-f6db-493c-a12a-25d88bb72c4d",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 62.34503173828125,
+      "top": 767.6391296386719
+    }
+  },
+  "10": {
+    "id": 10,
+    "type": "parameter_input",
+    "label": "text parameter input",
+    "content_id": null,
+    "name": "Input parameter",
+    "tool_state": {
+      "parameter_definition": "{\"__current_case__\": 0, \"optional\": {\"__current_case__\": 1, \"optional\": \"false\"}, \"parameter_type\": \"text\", \"restrictions\": {\"__current_case__\": 0, \"how\": \"none\"}}",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "output",
+        "label": "text parameter input",
+        "type": "text",
+        "optional": false,
+        "parameter": true
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {},
+    "uuid": "71c030ff-a29f-4e32-a735-37471e7a3f12",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 95.0506591796875,
+      "top": 867.0427551269531
+    }
+  },
+  "11": {
+    "id": 11,
+    "type": "tool",
+    "label": "list collection input",
+    "content_id": "count_list",
+    "name": "count_list",
+    "tool_state": {
+      "input1": "{\"__class__\": \"RuntimeValue\"}",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [
+      {
+        "name": "input1",
+        "label": "Concatenate Dataset",
+        "multiple": false,
+        "input_type": "dataset_collection",
+        "collection_types": [
+          "list"
+        ],
+        "optional": false,
+        "extensions": [
+          "data"
+        ]
+      }
+    ],
+    "outputs": [
+      {
+        "name": "out_file1",
+        "extensions": [
+          "txt"
+        ],
+        "type": "data",
+        "optional": false
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {
+      "HideDatasetActionout_file1": {
+        "action_type": "HideDatasetAction",
+        "output_name": "out_file1",
+        "action_arguments": {}
+      }
+    },
+    "uuid": "b7cc7fff-d167-4333-a0cd-f7a23c3420f4",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 867.0313110351562,
+      "top": 390.6929626464844
+    }
+  },
+  "12": {
+    "id": 12,
+    "type": "tool",
+    "label": "two list inputs",
+    "content_id": "collection_two_paired",
+    "name": "collection_two_paired",
+    "tool_state": {
+      "kind": "{\"__current_case__\": 1, \"collection_type\": \"list\", \"f1\": {\"__class__\": \"RuntimeValue\"}, \"f2\": {\"__class__\": \"RuntimeValue\"}}",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [
+      {
+        "name": "kind|f1",
+        "label": "F1",
+        "multiple": false,
+        "input_type": "dataset_collection",
+        "collection_types": [
+          "list"
+        ],
+        "optional": false,
+        "extensions": [
+          "data"
+        ]
+      },
+      {
+        "name": "kind|f2",
+        "label": "F2",
+        "multiple": false,
+        "input_type": "dataset_collection",
+        "collection_types": [
+          "list"
+        ],
+        "optional": false,
+        "extensions": [
+          "data"
+        ]
+      }
+    ],
+    "outputs": [
+      {
+        "name": "out1",
+        "extensions": [
+          "txt"
+        ],
+        "type": "data",
+        "optional": false
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {
+      "HideDatasetActionout1": {
+        "action_type": "HideDatasetAction",
+        "output_name": "out1",
+        "action_arguments": {}
+      }
+    },
+    "uuid": "69d24038-b2d1-4ee6-a27a-2a65b085b72c",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 956.5660534497317,
+      "top": 120.95016995362289
+    }
+  },
+  "13": {
+    "id": 13,
+    "type": "tool",
+    "label": "list collection input 2",
+    "content_id": "count_list",
+    "name": "count_list",
+    "tool_state": {
+      "input1": "{\"__class__\": \"RuntimeValue\"}",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [
+      {
+        "name": "input1",
+        "label": "Concatenate Dataset",
+        "multiple": false,
+        "input_type": "dataset_collection",
+        "collection_types": [
+          "list"
+        ],
+        "optional": false,
+        "extensions": [
+          "data"
+        ]
+      }
+    ],
+    "outputs": [
+      {
+        "name": "out_file1",
+        "extensions": [
+          "txt"
+        ],
+        "type": "data",
+        "optional": false
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {
+      "HideDatasetActionout_file1": {
+        "action_type": "HideDatasetAction",
+        "output_name": "out_file1",
+        "action_arguments": {}
+      }
+    },
+    "uuid": "f5c65e31-97d2-4278-a7bc-b167a4da8453",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 877.2184448242188,
+      "top": 558.6768493652344
+    }
+  },
+  "14": {
+    "id": 14,
+    "type": "tool",
+    "label": "multiple simple data",
+    "content_id": "cat1",
+    "name": "Concatenate datasets",
+    "tool_state": {
+      "input1": "{\"__class__\": \"RuntimeValue\"}",
+      "queries": "[{\"__index__\": 0, \"input2\": {\"__class__\": \"RuntimeValue\"}}]",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [
+      {
+        "name": "input1",
+        "label": "Concatenate Dataset",
+        "multiple": false,
+        "extensions": [
+          "data"
+        ],
+        "optional": false,
+        "input_type": "dataset"
+      },
+      {
+        "name": "queries_0|input2",
+        "label": "Dataset 1 > Select",
+        "multiple": false,
+        "extensions": [
+          "data"
+        ],
+        "optional": false,
+        "input_type": "dataset"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "out_file1",
+        "extensions": [
+          "input"
+        ],
+        "type": "data",
+        "optional": false
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {
+      "HideDatasetActionout_file1": {
+        "action_type": "HideDatasetAction",
+        "output_name": "out_file1",
+        "action_arguments": {}
+      }
+    },
+    "uuid": "cb3fd87f-8632-4302-a647-a37831d36632",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 895.1365310873025,
+      "top": 746.3601702988319
+    }
+  },
+  "15": {
+    "id": 15,
+    "type": "tool",
+    "label": "multi data",
+    "content_id": "multi_data_param",
+    "name": "multi_data_param",
+    "tool_state": {
+      "f1": {
+        "__class__": "RuntimeValue"
+      },
+      "f2": {
+        "__class__": "RuntimeValue"
+      },
+      "advanced": {
+        "full": "yes",
+        "__current_case__": 0,
+        "advanced_threshold": {
+          "__class__": "ConnectedValue"
+        }
+      },
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [
+      {
+        "name": "f1",
+        "label": "Data 1",
+        "multiple": true,
+        "extensions": [
+          "txt"
+        ],
+        "optional": false,
+        "input_type": "dataset"
+      },
+      {
+        "name": "f2",
+        "label": "Data 2",
+        "multiple": true,
+        "extensions": [
+          "txt"
+        ],
+        "optional": false,
+        "input_type": "dataset"
+      },
+      {
+        "name": "advanced|advanced_threshold",
+        "label": "advanced_threshold",
+        "multiple": false,
+        "input_type": "parameter",
+        "optional": false,
+        "type": "integer"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "out1",
+        "extensions": [
+          "txt"
+        ],
+        "type": "data",
+        "optional": false
+      },
+      {
+        "name": "out2",
+        "extensions": [
+          "txt"
+        ],
+        "type": "data",
+        "optional": false
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {
+      "HideDatasetActionout1": {
+        "action_type": "HideDatasetAction",
+        "output_name": "out1",
+        "action_arguments": {}
+      },
+      "HideDatasetActionout2": {
+        "action_type": "HideDatasetAction",
+        "output_name": "out2",
+        "action_arguments": {}
+      }
+    },
+    "uuid": "86ff43c1-5c03-46ea-a47f-afa4e61f2029",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 406.02532958984375,
+      "top": 259.6603088378906
+    }
+  },
+  "16": {
+    "id": 16,
+    "type": "data_collection_input",
+    "label": "list:list:list input",
+    "content_id": null,
+    "name": "Input dataset collection",
+    "tool_state": {
+      "collection_type": "\"list:list:list\"",
+      "optional": "\"false\"",
+      "tag": "\"\"",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "output",
+        "extensions": [
+          "input"
+        ],
+        "collection": true,
+        "collection_type": "list:list:list",
+        "optional": false
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {},
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 70.45245361328125,
+      "top": 316.3525695800781
+    }
+  }
+}
diff --git a/client/src/components/Workflow/Editor/test-data/simple_steps.json b/client/src/components/Workflow/Editor/test-data/simple_steps.json
new file mode 100644
index 00000000000..a3cd12dbbfc
--- /dev/null
+++ b/client/src/components/Workflow/Editor/test-data/simple_steps.json
@@ -0,0 +1,86 @@
+{
+  "0": {
+    "id": 0,
+    "type": "data_input",
+    "label": "data input",
+    "content_id": null,
+    "name": "Input dataset",
+    "tool_state": {
+      "optional": "\"false\"",
+      "tag": "\"\"",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [],
+    "outputs": [
+      {
+        "name": "output",
+        "extensions": [
+          "input"
+        ],
+        "optional": false
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {},
+    "uuid": "bdfb1f7e-a7b7-4c95-85cb-901abdc6b276",
+    "workflow_outputs": [],
+    "input_connections": {},
+    "position": {
+      "left": 0,
+      "top": 0
+    }
+  },
+  "1": {
+    "id": 1,
+    "type": "tool",
+    "label": "",
+    "content_id": "Cut1",
+    "name": "Cut",
+    "tool_state": {
+      "columnList": "\"c1,c2\"",
+      "delimiter": "\"T\"",
+      "input": "{\"__class__\": \"ConnectedValue\"}",
+      "__page__": null,
+      "__rerun_remap_job_id__": null
+    },
+    "errors": null,
+    "inputs": [
+      {
+        "name": "input",
+        "label": "From",
+        "multiple": false,
+        "extensions": [
+          "txt"
+        ],
+        "optional": false,
+        "input_type": "dataset"
+      }
+    ],
+    "outputs": [
+      {
+        "name": "out_file1",
+        "extensions": [
+          "tabular"
+        ],
+        "type": "data",
+        "optional": false
+      }
+    ],
+    "annotation": "",
+    "post_job_actions": {},
+    "uuid": "16626ff6-6484-4db2-bffc-71b69ff05b80",
+    "workflow_outputs": [],
+    "input_connections": {
+      "input": {
+        "output_name": "output",
+        "id": 0
+      }
+    },
+    "position": {
+      "left": 231.74591064453125,
+      "top": 122.94705200195312
+    }
+  }
+}
diff --git a/client/src/components/Workflow/Editor/test_fixtures.ts b/client/src/components/Workflow/Editor/test_fixtures.ts
new file mode 100644
index 00000000000..f998956af4a
--- /dev/null
+++ b/client/src/components/Workflow/Editor/test_fixtures.ts
@@ -0,0 +1,12 @@
+import { toRefs, reactive } from "vue";
+import type { UseElementBoundingReturn } from "@vueuse/core";
+import type { Steps } from "@/stores/workflowStepStore";
+import * as _simpleSteps from "./test-data/simple_steps.json";
+import * as _advancedSteps from "./test-data/parameter_steps.json";
+
+const _mockOffset = toRefs(reactive({ top: 0, left: 0, bottom: 10, right: 10, width: 100, height: 100, x: 0, y: 0 }));
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+export const mockOffset: UseElementBoundingReturn = { ..._mockOffset, update: () => {} };
+
+export const simpleSteps = _simpleSteps as Steps;
+export const advancedSteps = _advancedSteps as Steps;
diff --git a/client/src/components/Workflow/Import/FromFileOrUrl.vue b/client/src/components/Workflow/Import/FromFileOrUrl.vue
index 15f2c3e59c8..33529d93762 100644
--- a/client/src/components/Workflow/Import/FromFileOrUrl.vue
+++ b/client/src/components/Workflow/Import/FromFileOrUrl.vue
@@ -1,19 +1,21 @@
-<script setup>
-import axios from "axios";
-import { computed, ref } from "vue";
-import { safePath } from "utils/redirect";
-import { redirectOnImport } from "../utils";
-import LoadingSpan from "components/LoadingSpan";
+<script setup lang="ts">
+import axios, { type AxiosError } from "axios";
+import { computed, ref, type Ref } from "vue";
+import { withPrefix } from "@/utils/redirect";
+import { getRedirectOnImportPath } from "../redirectPath";
+import LoadingSpan from "@/components/LoadingSpan.vue";
+import { useRouter } from "vue-router/composables";
 
 const loading = ref(false);
-const sourceURL = ref(null);
-const sourceFile = ref(null);
-const errorMessage = ref(null);
+const sourceURL: Ref<string | null> = ref(null);
+const sourceFile: Ref<string | null> = ref(null);
+const errorMessage: Ref<string | null> = ref(null);
 const acceptedWorkflowFormats = ".ga, .yml";
 
 const isImportDisabled = computed(() => {
     return !sourceFile.value && !sourceURL.value;
 });
+
 const importTooltip = computed(() => {
     return isImportDisabled.value
         ? "You must provide a workflow archive URL or file."
@@ -21,29 +23,39 @@ const importTooltip = computed(() => {
         ? "Import workflow from URL"
         : "Import workflow from File";
 });
+
 const hasErrorMessage = computed(() => {
     return errorMessage.value != null;
 });
 
-const submit = (ev) => {
+const router = useRouter();
+
+async function submit(ev: SubmitEvent) {
     ev.preventDefault();
     const formData = new FormData();
-    formData.append("archive_file", sourceFile.value);
-    formData.append("archive_source", sourceURL.value);
+
+    if (sourceFile.value) {
+        formData.append("archive_file", sourceFile.value);
+    }
+
+    if (sourceURL.value) {
+        formData.append("archive_source", sourceURL.value);
+    }
+
     loading.value = true;
-    axios
-        .post(safePath("/api/workflows"), formData)
-        .then((response) => {
-            redirectOnImport(safePath("/"), response.data);
-        })
-        .catch((error) => {
-            const message = error.response.data && error.response.data.err_msg;
-            errorMessage.value = message || "Import failed for an unknown reason.";
-        })
-        .finally(() => {
-            loading.value = false;
-        });
-};
+
+    try {
+        const response = await axios.post(withPrefix("/api/workflows"), formData);
+        const path = getRedirectOnImportPath(response.data);
+
+        router.push(path);
+    } catch (error) {
+        const message = (error as AxiosError).response?.data && (error as AxiosError).response?.data.err_msg;
+        errorMessage.value = message || "Import failed for an unknown reason.";
+    } finally {
+        loading.value = false;
+    }
+}
 </script>
 
 <template>
diff --git a/client/src/components/Workflow/Import/TrsImport.vue b/client/src/components/Workflow/Import/TrsImport.vue
index 4be7c270605..4488913e015 100644
--- a/client/src/components/Workflow/Import/TrsImport.vue
+++ b/client/src/components/Workflow/Import/TrsImport.vue
@@ -1,14 +1,15 @@
-<script setup>
-import TrsTool from "./TrsTool";
-import { Toast } from "composables/toast";
+<script setup lang="ts">
+import TrsTool from "./TrsTool.vue";
+import TrsUrlImport from "./TrsUrlImport.vue";
+import { Toast } from "@/composables/toast";
 import { Services } from "../services";
-import { getGalaxyInstance } from "app";
-import { safePath } from "utils/redirect";
-import { computed, ref, watch } from "vue";
-import { redirectOnImport } from "../utils";
-import LoadingSpan from "components/LoadingSpan";
-import TrsServerSelection from "./TrsServerSelection";
-import DebouncedInput from "components/DebouncedInput";
+import { getGalaxyInstance } from "@/app";
+import { computed, ref, watch, type Ref } from "vue";
+import { getRedirectOnImportPath } from "../redirectPath";
+import LoadingSpan from "@/components/LoadingSpan.vue";
+import TrsServerSelection from "./TrsServerSelection.vue";
+import { useRouter } from "vue-router/composables";
+import type { TrsSelection, TrsTool as TrsToolInterface } from "./types";
 
 const props = defineProps({
     queryTrsServer: {
@@ -23,24 +24,29 @@ const props = defineProps({
         type: String,
         default: null,
     },
+    queryTrsUrl: {
+        type: String,
+        default: null,
+    },
     isRun: {
         type: Boolean,
         default: false,
     },
 });
 
-const trsTool = ref(null);
+const trsTool: Ref<TrsToolInterface | null> = ref(null);
 const loading = ref(false);
 const importing = ref(false);
-const trsSelection = ref(null);
-const errorMessage = ref(null);
+const trsSelection: Ref<TrsSelection | null> = ref(null);
+const errorMessage: Ref<string | null> = ref(null);
 const toolId = ref(props.queryTrsId);
-const isAnonymous = getGalaxyInstance().user?.isAnonymous();
-const isAutoImport = ref(props.queryTrsVersionId && props.queryTrsServer && props.queryTrsId);
+const isAnonymous: Ref<boolean> = getGalaxyInstance().user?.isAnonymous();
+const isAutoImport = ref(Boolean(props.queryTrsVersionId && props.queryTrsServer && props.queryTrsId));
 
 const toolIdTrimmed = computed(() => {
     return toolId.value?.trim() || null;
 });
+
 const hasErrorMessage = computed(() => {
     return errorMessage.value != null;
 });
@@ -51,70 +57,97 @@ watch(toolIdTrimmed, () => {
 
 const services = new Services();
 
-const onToolId = () => {
+async function onToolId() {
     trsTool.value = null;
     errorMessage.value = null;
+
     if (!trsSelection.value || !toolIdTrimmed.value) {
         return;
     }
-    loading.value = true;
-    services
-        .getTrsTool(trsSelection.value.id, toolIdTrimmed.value)
-        .then((tool) => {
-            trsTool.value = tool;
-            if (isAutoImport.value) {
-                let versionField = "name";
-                const version = trsTool.value.versions.find((version) => {
-                    if (version.name === props.queryTrsVersionId) {
-                        return true;
-                    } else if (version.id === props.queryTrsVersionId) {
-                        versionField = "id";
-                        return true;
-                    }
-                });
-                if (version) {
-                    importVersion(trsSelection.value.id, trsTool.value.id, version[versionField], props.isRun);
-                } else {
-                    Toast.warning(`Specified version: ${props.queryTrsVersionId} doesn't exist`);
-                    isAutoImport.value = false;
-                }
-            }
-        })
-        .catch((e) => {
-            trsTool.value = null;
-            errorMessage.value = e;
-        })
-        .finally(() => {
-            loading.value = false;
-        });
-};
 
-const onTrsSelection = (selection) => {
+    loading.value = true;
+
+    try {
+        const tool = await services.getTrsTool(trsSelection.value.id, toolIdTrimmed.value);
+
+        trsTool.value = tool;
+
+        if (isAutoImport.value) {
+            let versionField: "name" | "id" = "name";
+            const version = trsTool.value!.versions.find((version) => {
+                if (version.name === props.queryTrsVersionId) {
+                    return true;
+                } else if (version.id === props.queryTrsVersionId) {
+                    versionField = "id";
+                    return true;
+                }
+            });
+
+            if (version) {
+                importVersion(trsSelection.value.id, trsTool.value!.id, version[versionField], props.isRun);
+            } else {
+                Toast.warning(`Specified version: ${props.queryTrsVersionId} doesn't exist`);
+                isAutoImport.value = false;
+            }
+        }
+    } catch (error) {
+        trsTool.value = null;
+        errorMessage.value = error as string;
+    } finally {
+        loading.value = false;
+    }
+}
+
+function onTrsSelection(selection: TrsSelection) {
     trsSelection.value = selection;
+
     if (toolIdTrimmed.value) {
         onToolId();
     }
-};
+}
 
-const onTrsSelectionError = (message) => {
+function onTrsSelectionError(message: string) {
     errorMessage.value = message;
-};
+}
+
+const router = useRouter();
+
+async function importVersion(trsId?: string, toolIdToImport?: string, version?: string, isRunFormRedirect = false) {
+    if (!trsId || !toolIdToImport) {
+        errorMessage.value = "Import Failed. Unknown Id";
+        return;
+    }
 
-const importVersion = (trsId, toolIdToImport, version = null, isRunFormRedirect = false) => {
     importing.value = true;
     errorMessage.value = null;
-    services
-        .importTrsTool(trsId, toolIdToImport, version)
-        .then((response) => {
-            redirectOnImport(safePath("/"), response, isRunFormRedirect);
-        })
-        .catch((e) => {
-            errorMessage.value = e || "Import failed for an unknown reason.";
-        })
-        .finally(() => {
-            importing.value = false;
-        });
-};
+
+    try {
+        const response = await services.importTrsTool(trsId, toolIdToImport, version);
+        const path = getRedirectOnImportPath(response, isRunFormRedirect);
+
+        router.push(path);
+    } catch (error) {
+        errorMessage.value = (error as string) || "Import failed for an unknown reason.";
+    } finally {
+        importing.value = false;
+    }
+}
+
+async function importVersionFromUrl(url: string, isRunFormRedirect = false) {
+    importing.value = true;
+    errorMessage.value = null;
+
+    try {
+        const response = await services.importTrsToolFromUrl(url);
+        const path = getRedirectOnImportPath(response, isRunFormRedirect);
+
+        router.push(path);
+    } catch (error) {
+        errorMessage.value = (error as string) || "Import failed for an unknown reason.";
+    } finally {
+        importing.value = false;
+    }
+}
 </script>
 
 <template>
@@ -133,11 +166,9 @@ const importVersion = (trsId, toolIdToImport, version = null, isRunFormRedirect
             </b-alert>
             <div v-else>
                 <div class="my-3">
-                    <DebouncedInput v-slot="{ value, input }" v-model="toolId">
-                        <b-form-group label="TRS ID:" label-class="font-weight-bold">
-                            <b-form-input id="trs-id-input" :value="value" @input="input" />
-                        </b-form-group>
-                    </DebouncedInput>
+                    <b-form-group label="TRS ID:" label-class="font-weight-bold">
+                        <b-form-input id="trs-id-input" v-model="toolId" debounce="500" />
+                    </b-form-group>
                 </div>
                 <div>
                     <b-alert v-if="loading" show variant="info">
@@ -151,7 +182,11 @@ const importVersion = (trsId, toolIdToImport, version = null, isRunFormRedirect
                 <TrsTool
                     v-if="trsTool"
                     :trs-tool="trsTool"
-                    @onImport="importVersion(trsSelection.id, trsTool.id, $event)" />
+                    @onImport="(versionId) => importVersion(trsSelection?.id, trsTool?.id, versionId)" />
+            </div>
+            <hr />
+            <div>
+                <TrsUrlImport :query-trs-url="props.queryTrsUrl" @onImport="(url) => importVersionFromUrl(url)" />
             </div>
         </b-card>
         <b-alert v-else class="text-center my-2" show variant="danger">
diff --git a/client/src/components/Workflow/Import/TrsSearch.vue b/client/src/components/Workflow/Import/TrsSearch.vue
index c6688a5c1fd..723e5a05261 100644
--- a/client/src/components/Workflow/Import/TrsSearch.vue
+++ b/client/src/components/Workflow/Import/TrsSearch.vue
@@ -1,13 +1,22 @@
-<script setup>
+<script setup lang="ts">
 import axios from "axios";
-import TrsTool from "./TrsTool";
+import TrsTool from "./TrsTool.vue";
 import { Services } from "../services";
-import { safePath } from "utils/redirect";
-import { computed, ref, watch } from "vue";
-import { redirectOnImport } from "../utils";
-import LoadingSpan from "components/LoadingSpan";
-import TrsServerSelection from "./TrsServerSelection";
-import DebouncedInput from "components/DebouncedInput";
+import { withPrefix } from "@/utils/redirect";
+import { computed, ref, watch, type Ref } from "vue";
+import { getRedirectOnImportPath } from "../redirectPath";
+import LoadingSpan from "@/components/LoadingSpan.vue";
+import TrsServerSelection from "./TrsServerSelection.vue";
+import { useRouter } from "vue-router/composables";
+import { BCard } from "bootstrap-vue";
+import type { TrsSelection } from "./types";
+
+type TrsSearchData = {
+    id: string;
+    name: string;
+    description: string;
+    [key: string]: unknown;
+};
 
 const fields = [
     { key: "name", label: "Name" },
@@ -16,60 +25,63 @@ const fields = [
 ];
 
 const query = ref("");
-const results = ref([]);
+const results: Ref<TrsSearchData[]> = ref([]);
 const trsServer = ref("");
 const loading = ref(false);
 const importing = ref(false);
-const trsSelection = ref(null);
-const errorMessage = ref(null);
+const trsSelection: Ref<TrsSelection | null> = ref(null);
+const errorMessage: Ref<string | null> = ref(null);
 
 const hasErrorMessage = computed(() => {
     return errorMessage.value != null;
 });
+
 const itemsComputed = computed(() => {
     return computeItems(results.value);
 });
+
 const searchHelp = computed(() => {
     return "Search by workflow description. Tags (key:value) can be used to also search by metadata - for instance name:example. Available tags include organization and name.";
 });
 
 const services = new Services();
 
-watch(query, () => {
+watch(query, async () => {
     if (query.value == "") {
         results.value = [];
     } else {
         loading.value = true;
-        axios
-            .get(safePath(`/api/trs_search?query=${query.value}&trs_server=${trsServer.value}`))
-            .then((response) => {
-                results.value = response.data;
-            })
-            .catch((e) => {
-                errorMessage.value = e;
-            })
-            .finally(() => {
-                loading.value = false;
-            });
+
+        try {
+            const response = await axios.get(
+                withPrefix(`/api/trs_search?query=${query.value}&trs_server=${trsServer.value}`)
+            );
+            results.value = response.data;
+        } catch (e) {
+            errorMessage.value = e as string;
+        }
+
+        loading.value = false;
     }
 });
 
-const onTrsSelection = (selection) => {
+function onTrsSelection(selection: TrsSelection) {
     trsSelection.value = selection;
     trsServer.value = selection.id;
     query.value = "";
-};
+}
 
-const onTrsSelectionError = (message) => {
+function onTrsSelectionError(message: string) {
     errorMessage.value = message;
-};
-const showRowDetails = (row, index, e) => {
-    if (e.target.nodeName != "A") {
+}
+
+function showRowDetails(row: BCard, index: number, e: MouseEvent) {
+    if ((e.target as Node | undefined)?.nodeName !== "A") {
         row._showDetails = !row._showDetails;
     }
-};
+}
 
-const computeItems = (items) => {
+function computeItems(items: TrsSearchData[]) {
     return items.map((item) => {
         return {
             id: item.id,
@@ -79,23 +91,30 @@ const computeItems = (items) => {
             _showDetails: false,
         };
     });
-};
+}
+
+const router = useRouter();
+
+async function importVersion(trsId?: string, toolIdToImport?: string, version?: string, isRunFormRedirect = false) {
+    if (!trsId || !toolIdToImport) {
+        errorMessage.value = "Import Failed. Unknown Id";
+        return;
+    }
 
-const importVersion = (trsId, toolIdToImport, version = null, isRunFormRedirect = false) => {
     importing.value = true;
     errorMessage.value = null;
-    services
-        .importTrsTool(trsId, toolIdToImport, version)
-        .then((response) => {
-            redirectOnImport(safePath("/"), response, isRunFormRedirect);
-        })
-        .catch((e) => {
-            errorMessage.value = e || "Import failed for an unknown reason.";
-        })
-        .finally(() => {
-            importing.value = false;
-        });
-};
+
+    try {
+        const response = await services.importTrsTool(trsId, toolIdToImport, version);
+        const path = getRedirectOnImportPath(response, isRunFormRedirect);
+
+        router.push(path);
+    } catch (e) {
+        errorMessage.value = (e as string) || "Import failed for an unknown reason.";
+    }
+
+    importing.value = false;
+}
 </script>
 
 <template>
@@ -112,15 +131,13 @@ const importVersion = (trsId, toolIdToImport, version = null, isRunFormRedirect
 
         <div>
             <b-input-group class="mb-3">
-                <DebouncedInput v-slot="{ value, input }" v-model="query">
-                    <b-form-input
-                        id="trs-search-query"
-                        :value="value"
-                        placeholder="search query"
-                        data-description="filter text input"
-                        @input="input"
-                        @keyup.esc="query = ''" />
-                </DebouncedInput>
+                <b-form-input
+                    id="trs-search-query"
+                    v-model="query"
+                    debounce="500"
+                    placeholder="search query"
+                    data-description="filter text input"
+                    @keyup.esc="query = ''" />
                 <b-input-group-append>
                     <b-button
                         v-b-tooltip
@@ -160,7 +177,7 @@ const importVersion = (trsId, toolIdToImport, version = null, isRunFormRedirect
                         </b-alert>
                         <TrsTool
                             :trs-tool="row.item.data"
-                            @onImport="importVersion(trsSelection.id, row.item.data.id, $event)" />
+                            @onImport="(versionId) => importVersion(trsSelection?.id, row.item.data.id, versionId)" />
                     </b-card>
                 </template>
             </b-table>
diff --git a/client/src/components/Workflow/Import/TrsServerSelection.vue b/client/src/components/Workflow/Import/TrsServerSelection.vue
index 2a6884f0402..aa9f4da346e 100644
--- a/client/src/components/Workflow/Import/TrsServerSelection.vue
+++ b/client/src/components/Workflow/Import/TrsServerSelection.vue
@@ -1,82 +1,87 @@
-<script setup>
+<script setup lang="ts">
 import { Services } from "../services";
-import { computed, ref, watch } from "vue";
+import { computed, ref, watch, type Ref } from "vue";
+import type { TrsSelection } from "./types";
 
-const props = defineProps({
-    queryTrsServer: {
-        type: String,
-        default: null,
-    },
-    trsSelection: {
-        type: Object,
-        default: null,
-    },
-});
+const props = defineProps<{
+    queryTrsServer?: string;
+    trsSelection?: TrsSelection | null;
+}>();
 
-const emit = defineEmits(["onError", "onTrsSelection"]);
+const emit = defineEmits<{
+    (e: "onError", errorMessage: string): void;
+    (e: "onTrsSelection", selection: TrsSelection): void;
+}>();
 
 const loading = ref(true);
-const selection = ref(null);
-const trsServers = ref([]);
-const trsSelection = ref(null);
+const selection: Ref<TrsSelection | null> = ref(null);
+const trsServers: Ref<TrsSelection[]> = ref([]);
+const trsSelection: Ref<TrsSelection | null> = ref(null);
 
 const showDropdown = computed(() => {
     return trsServers.value.length > 1;
 });
 
 watch(props, () => {
-    selection.value = props.trsSelection;
+    selection.value = props.trsSelection ?? null;
 });
 
 const services = new Services();
 
-const _configureTrsServers = () => {
-    services.getTrsServers().then((servers) => {
-        trsServers.value = servers;
-        const queryTrsServer = props.queryTrsServer;
+async function configureTrsServers() {
+    const servers = await services.getTrsServers();
+    const queryTrsServer = props.queryTrsServer;
+
+    trsServers.value = servers;
+
+    if (queryTrsServer) {
+        for (const server of servers) {
+            if (server.id == queryTrsServer) {
+                trsSelection.value = server;
+                break;
+            }
+
+            if (possibleServeUrlsMatch(server.api_url, queryTrsServer)) {
+                trsSelection.value = server;
+                break;
+            }
+
+            if (possibleServeUrlsMatch(server.link_url, queryTrsServer)) {
+                trsSelection.value = server;
+                break;
+            }
+        }
+    }
+
+    if (trsSelection.value === null) {
         if (queryTrsServer) {
-            for (const server of servers) {
-                if (server.id == queryTrsServer) {
-                    trsSelection.value = server;
-                    break;
-                }
-                if (possibleServeUrlsMatch(server.api_url, queryTrsServer)) {
-                    trsSelection.value = server;
-                    break;
-                }
-                if (possibleServeUrlsMatch(server.link_url, queryTrsServer)) {
-                    trsSelection.value = server;
-                    break;
-                }
-            }
+            emit("onError", "Failed to find requested TRS server " + queryTrsServer);
         }
-        if (trsSelection.value === null) {
-            if (queryTrsServer) {
-                emit("onError", "Failed to find requested TRS server " + queryTrsServer);
-            }
-            trsSelection.value = servers[0];
-        }
-        selection.value = trsSelection.value;
-        loading.value = false;
-        onTrsSelection(trsSelection.value);
-    });
-};
 
-const onTrsSelection = (selection) => {
-    selection.value = selection;
-    emit("onTrsSelection", selection);
-};
+        trsSelection.value = servers[0];
+    }
 
-const possibleServeUrlsMatch = (a, b) => {
+    selection.value = trsSelection.value;
+    loading.value = false;
+
+    onTrsSelection(trsSelection.value as TrsSelection);
+}
+
+configureTrsServers();
+
+function onTrsSelection(newSelection: TrsSelection) {
+    selection.value = newSelection;
+    emit("onTrsSelection", newSelection);
+}
+
+function possibleServeUrlsMatch(a: string, b: string) {
     // let http://trs_server.org/ match with https://trs_server.org for instance,
     // we'll only use the one configured on the backend for making actual calls, but
     // allow some robustness in matching it
     a = a.replace(/^https?:\/\//, "").replace(/\/$/, "");
     b = b.replace(/^https?:\/\//, "").replace(/\/$/, "");
-    return a == b;
-};
-
-_configureTrsServers();
+    return a === b;
+}
 </script>
 
 <template>
@@ -88,7 +93,7 @@ _configureTrsServers();
                 aria-haspopup="true"
                 aria-expanded="false"
                 class="font-weight-bold">
-                {{ selection.label }}
+                {{ selection?.label }}
                 <span class="fa fa-caret-down" />
             </b-link>
             <div class="dropdown-menu" aria-labelledby="dropdownTrsServer">
@@ -104,8 +109,8 @@ _configureTrsServers();
             </div>
         </span>
         <span v-else>
-            <b-link :href="selection.link_url" target="_blank" class="font-weight-bold" :title="selection.doc">
-                {{ selection.label }}
+            <b-link :href="selection?.link_url" target="_blank" class="font-weight-bold" :title="selection?.doc">
+                {{ selection?.label }}
             </b-link>
         </span>
     </span>
diff --git a/client/src/components/Workflow/Import/TrsTool.vue b/client/src/components/Workflow/Import/TrsTool.vue
index 6867366bbe0..75f9686afc2 100644
--- a/client/src/components/Workflow/Import/TrsTool.vue
+++ b/client/src/components/Workflow/Import/TrsTool.vue
@@ -1,17 +1,16 @@
-<script setup>
-const props = defineProps({
-    trsTool: {
-        type: Object,
-        required: true,
-    },
-});
+<script setup lang="ts">
+import type { TrsTool, TrsToolVersion } from "./types";
 
-const emit = defineEmits(["onImport"]);
+const props = defineProps<{ trsTool: TrsTool }>();
 
-const importVersion = (version) => {
+const emit = defineEmits<{
+    (e: "onImport", versionId: string): void;
+}>();
+
+function importVersion(version: TrsToolVersion) {
     const version_id = version.id.includes(`:${version.name}`) ? version.name : version.id;
     emit("onImport", version_id);
-};
+}
 </script>
 
 <template>
diff --git a/client/src/components/Workflow/Import/TrsUrlImport.vue b/client/src/components/Workflow/Import/TrsUrlImport.vue
new file mode 100644
index 00000000000..18aee46dca9
--- /dev/null
+++ b/client/src/components/Workflow/Import/TrsUrlImport.vue
@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import { computed, ref } from "vue";
+
+const props = defineProps({
+    queryTrsUrl: {
+        type: String,
+        default: null,
+    },
+});
+
+const trsUrl = ref(props.queryTrsUrl);
+
+const isImportDisabled = computed(() => {
+    return !trsUrl.value;
+});
+
+const importTooltip = computed(() => {
+    return isImportDisabled.value ? "You must provide a TRS URL." : "Import workflow from TRS URL";
+});
+
+const emit = defineEmits<{
+    (e: "onImport", url: string): void;
+}>();
+
+function submit(ev: SubmitEvent) {
+    ev.preventDefault();
+    emit("onImport", trsUrl.value);
+}
+
+// Automatically trigger the import if the TRS URL was provided as a query param
+if (trsUrl.value) {
+    emit("onImport", trsUrl.value);
+}
+</script>
+
+<template>
+    <b-form class="mt-4" @submit="submit">
+        <h2 class="h-sm">alternatively, provide a TRS URL directly</h2>
+        <b-form-group label="TRS URL:" label-class="font-weight-bold">
+            <b-form-input id="trs-import-url-input" v-model="trsUrl" aria-label="TRS URL" type="url" />
+            If the workflow is accessible via a TRS URL, enter the URL above and click Import.
+        </b-form-group>
+        <b-button
+            id="trs-url-import-button"
+            type="submit"
+            :disabled="isImportDisabled"
+            :title="importTooltip"
+            variant="primary">
+            Import workflow
+        </b-button>
+    </b-form>
+</template>
diff --git a/client/src/components/Workflow/Import/types.d.ts b/client/src/components/Workflow/Import/types.d.ts
new file mode 100644
index 00000000000..42ba235d6d3
--- /dev/null
+++ b/client/src/components/Workflow/Import/types.d.ts
@@ -0,0 +1,19 @@
+export interface TrsSelection {
+    id: string;
+    label: string;
+    link_url: string;
+    doc: string;
+}
+
+export interface TrsToolVersion {
+    id: string;
+    name: string;
+}
+
+export interface TrsTool {
+    id: string;
+    name: string;
+    description: string;
+    organization: string;
+    versions: TrsToolVersion[];
+}
diff --git a/client/src/components/Workflow/Invocation/Export/InvocationExportPluginCard.test.js b/client/src/components/Workflow/Invocation/Export/InvocationExportPluginCard.test.js
index b0d458ea1d6..171ecc88014 100644
--- a/client/src/components/Workflow/Invocation/Export/InvocationExportPluginCard.test.js
+++ b/client/src/components/Workflow/Invocation/Export/InvocationExportPluginCard.test.js
@@ -1,5 +1,5 @@
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import MockAdapter from "axios-mock-adapter";
 import axios from "axios";
 import flushPromises from "flush-promises";
@@ -12,7 +12,12 @@ const FAKE_INVOCATION_ID = "fake-invocation-id";
 const FAKE_EXPORT_PLUGIN = new InvocationExportPlugin({
     title: "Plugin Title",
     markdownDescription: `some **markdown** description`,
-    downloadFormat: "tgz",
+    exportParams: {
+        modelStoreFormat: "tgz",
+        includeFiles: false,
+        includeDeleted: false,
+        includeHidden: false,
+    },
     additionalActions: [
         new InvocationExportPluginAction({
             id: "fake-action-1",
diff --git a/client/src/components/Workflow/Invocation/Export/InvocationExportPluginCard.vue b/client/src/components/Workflow/Invocation/Export/InvocationExportPluginCard.vue
index 736457e9490..888e849e9aa 100644
--- a/client/src/components/Workflow/Invocation/Export/InvocationExportPluginCard.vue
+++ b/client/src/components/Workflow/Invocation/Export/InvocationExportPluginCard.vue
@@ -26,11 +26,12 @@ provide("invocationId", props.invocationId);
 const descriptionRendered = computed(() => renderMarkdown(props.exportPlugin.markdownDescription));
 const invocationDownloadUrl = computed(() => `/api/invocations/${props.invocationId}/prepare_store_download`);
 const downloadParams = computed(() => {
+    const exportParams = props.exportPlugin.exportParams;
     return {
-        model_store_format: props.exportPlugin.downloadFormat,
-        include_files: false,
-        include_deleted: false,
-        include_hidden: false,
+        model_store_format: exportParams.modelStoreFormat,
+        include_files: exportParams.includeFiles,
+        include_deleted: exportParams.includeDeleted,
+        include_hidden: exportParams.includeHidden,
     };
 });
 
@@ -39,7 +40,8 @@ function openRemoteExportDialog() {
 }
 
 function exportToFileSource(exportDirectory, fileName) {
-    const exportDirectoryUri = `${exportDirectory}/${fileName}.${props.exportPlugin.downloadFormat}`;
+    const exportFormat = props.exportPlugin.exportParams.modelStoreFormat;
+    const exportDirectoryUri = `${exportDirectory}/${fileName}.${exportFormat}`;
     const writeStoreParams = {
         target_uri: exportDirectoryUri,
         ...downloadParams.value,
diff --git a/client/src/components/Workflow/Invocation/Export/Plugins/BioComputeObject/BioComputeObjectExportPlugin.js b/client/src/components/Workflow/Invocation/Export/Plugins/BioComputeObject/BioComputeObjectExportPlugin.js
index a125fa4343c..8e9dd61b618 100644
--- a/client/src/components/Workflow/Invocation/Export/Plugins/BioComputeObject/BioComputeObjectExportPlugin.js
+++ b/client/src/components/Workflow/Invocation/Export/Plugins/BioComputeObject/BioComputeObjectExportPlugin.js
@@ -13,7 +13,12 @@ A BCO is designed to communicate High-throughput Sequencing (HTS) analysis resul
 Learn more about [BioCompute Objects](https://biocomputeobject.org/).
 
 Instructions for [creating a BCO using Galaxy](https://w3id.org/biocompute/tutorials/galaxy_quick_start).`,
-    downloadFormat: "bco.json",
+    exportParams: {
+        modelStoreFormat: "bco.json",
+        includeFiles: false,
+        includeDeleted: false,
+        includeHidden: false,
+    },
     additionalActions: [
         new InvocationExportPluginAction({
             id: "send-to-bco-db",
diff --git a/client/src/components/Workflow/Invocation/Export/Plugins/BioComputeObject/SendForm.vue b/client/src/components/Workflow/Invocation/Export/Plugins/BioComputeObject/SendForm.vue
index fe09c0def42..0f04f93fec5 100644
--- a/client/src/components/Workflow/Invocation/Export/Plugins/BioComputeObject/SendForm.vue
+++ b/client/src/components/Workflow/Invocation/Export/Plugins/BioComputeObject/SendForm.vue
@@ -3,7 +3,7 @@ import { ref, reactive, inject } from "vue";
 import { BModal } from "bootstrap-vue";
 import axios from "axios";
 import { Toast } from "composables/toast";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import ExternalLink from "components/ExternalLink";
 
@@ -48,10 +48,10 @@ async function generateBcoContent() {
             include_deleted: false,
             include_hidden: false,
         };
-        const response = await axios.post(safePath(`/api/invocations/${invocationId}/prepare_store_download`), data);
+        const response = await axios.post(withPrefix(`/api/invocations/${invocationId}/prepare_store_download`), data);
         const storage_request_id = response.data.storage_request_id;
-        const pollUrl = safePath(`/api/short_term_storage/${storage_request_id}/ready`);
-        const resultUrl = safePath(`/api/short_term_storage/${storage_request_id}`);
+        const pollUrl = withPrefix(`/api/short_term_storage/${storage_request_id}/ready`);
+        const resultUrl = withPrefix(`/api/short_term_storage/${storage_request_id}`);
         let pollingResponse = await axios.get(pollUrl);
         let maxRetries = 120;
         while (!pollingResponse.data && maxRetries) {
diff --git a/client/src/components/Workflow/Invocation/Export/Plugins/DefaultFileExportPlugin.js b/client/src/components/Workflow/Invocation/Export/Plugins/DefaultFileExportPlugin.js
index a0495fc7a41..648aa489b44 100644
--- a/client/src/components/Workflow/Invocation/Export/Plugins/DefaultFileExportPlugin.js
+++ b/client/src/components/Workflow/Invocation/Export/Plugins/DefaultFileExportPlugin.js
@@ -3,6 +3,11 @@ import { InvocationExportPlugin } from "../model";
 export const DEFAULT_FILE_EXPORT_PLUGIN = new InvocationExportPlugin({
     title: "File",
     markdownDescription: `Export the invocation to a compressed File containing the invocation data in Galaxy native format.`,
-    downloadFormat: "tgz",
+    exportParams: {
+        modelStoreFormat: "tgz",
+        includeFiles: false,
+        includeDeleted: false,
+        includeHidden: false,
+    },
     additionalActions: [],
 });
diff --git a/client/src/components/Workflow/Invocation/Export/Plugins/ROCrateExportPlugin.js b/client/src/components/Workflow/Invocation/Export/Plugins/ROCrateExportPlugin.js
index 1811d5f2d8b..ea8f9326175 100644
--- a/client/src/components/Workflow/Invocation/Export/Plugins/ROCrateExportPlugin.js
+++ b/client/src/components/Workflow/Invocation/Export/Plugins/ROCrateExportPlugin.js
@@ -6,5 +6,10 @@ export const RO_CRATE_EXPORT_PLUGIN = new InvocationExportPlugin({
 RO-Crate is a community effort to establish a lightweight approach to packaging research data with their metadata. It is based on schema.org annotations in JSON-LD, and aims to make best-practice in formal metadata description accessible and practical for use in a wider variety of situations, from an individual researcher working with a folder of data, to large data-intensive computational research environments.
 
 Learn more about [RO Crate](https://www.researchobject.org/ro-crate/).`,
-    downloadFormat: "rocrate.zip",
+    exportParams: {
+        modelStoreFormat: "rocrate.zip",
+        includeFiles: true,
+        includeDeleted: false,
+        includeHidden: false,
+    },
 });
diff --git a/client/src/components/Workflow/Invocation/Export/model.js b/client/src/components/Workflow/Invocation/Export/model.js
index d115291f196..a9197d94fb8 100644
--- a/client/src/components/Workflow/Invocation/Export/model.js
+++ b/client/src/components/Workflow/Invocation/Export/model.js
@@ -22,11 +22,11 @@ export class InvocationExportPlugin {
         this.markdownDescription = props.markdownDescription ?? "No description provided";
 
         /**
-         * A string used to identify the Galaxy export store that handles the download format in the backend.
+         * An object with parameters for the Galaxy export store that handles the download format in the backend.
          * Check lib/galaxy/model/store/__init__.py::get_export_store_factory for more info.
-         * @type {string}
+         * @type {Object}
          */
-        this.downloadFormat = props.downloadFormat ?? "unknown format";
+        this.exportParams = props.exportParams ?? null;
 
         /**
          * A list of additional actions that this plugin can do with the exported invocation in addition
diff --git a/client/src/components/Workflow/InvocationReport.vue b/client/src/components/Workflow/InvocationReport.vue
index fe6f58b904f..0acbdbc0c91 100644
--- a/client/src/components/Workflow/InvocationReport.vue
+++ b/client/src/components/Workflow/InvocationReport.vue
@@ -10,7 +10,7 @@
 </template>
 
 <script>
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 import { urlData } from "utils/url";
 import { Toast } from "composables/toast";
 import ConfigProvider from "components/providers/ConfigProvider";
@@ -58,7 +58,7 @@ export default {
     },
     methods: {
         onEdit() {
-            window.location = safePath(`/pages/create?invocation_id=${this.invocationId}`);
+            window.location = withPrefix(`/pages/create?invocation_id=${this.invocationId}`);
         },
     },
 };
diff --git a/client/src/components/Workflow/InvocationsList.test.js b/client/src/components/Workflow/InvocationsList.test.js
index eba495d7806..eed58f6d305 100644
--- a/client/src/components/Workflow/InvocationsList.test.js
+++ b/client/src/components/Workflow/InvocationsList.test.js
@@ -2,7 +2,7 @@ import InvocationsList from "./InvocationsList";
 import { mount } from "@vue/test-utils";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import mockInvocationData from "./test/json/invocation.json";
 import { parseISO, formatDistanceToNow } from "date-fns";
 
diff --git a/client/src/components/Workflow/Run/WorkflowRun.test.js b/client/src/components/Workflow/Run/WorkflowRun.test.js
index 7841af064fb..075216f07fd 100644
--- a/client/src/components/Workflow/Run/WorkflowRun.test.js
+++ b/client/src/components/Workflow/Run/WorkflowRun.test.js
@@ -1,6 +1,6 @@
 import WorkflowRun from "./WorkflowRun.vue";
 import { shallowMount, createLocalVue } from "@vue/test-utils";
-import { watchForChange } from "jest/helpers";
+import { watchForChange } from "tests/jest/helpers";
 
 import sampleRunData1 from "./testdata/run1.json";
 
diff --git a/client/src/components/Workflow/Run/model.js b/client/src/components/Workflow/Run/model.js
index 9be78546cff..bea7ef083b5 100644
--- a/client/src/components/Workflow/Run/model.js
+++ b/client/src/components/Workflow/Run/model.js
@@ -100,7 +100,7 @@ export class WorkflowRunModel {
                 name: wp_name,
                 type: "text",
                 color: `hsl( ${++wp_count * 100}, 70%, 30% )`,
-                style: "ui-form-wp-source",
+                cls: "ui-input-linked",
                 links: [],
                 optional: true,
             });
@@ -122,8 +122,7 @@ export class WorkflowRunModel {
                     wp_input.links.push(step);
                     input.wp_linked = true;
                     input.type = "text";
-                    input.backdrop = true;
-                    input.style = "ui-form-wp-target";
+                    input.cls = "ui-input-linked";
                 });
             });
             _.each(step.replacement_parameters, (wp_name) => {
diff --git a/client/src/components/Workflow/WorkflowDropdown.test.js b/client/src/components/Workflow/WorkflowDropdown.test.js
index e9ba6b88bab..a9c81f1f9ad 100644
--- a/client/src/components/Workflow/WorkflowDropdown.test.js
+++ b/client/src/components/Workflow/WorkflowDropdown.test.js
@@ -1,6 +1,6 @@
 import WorkflowDropdown from "./WorkflowDropdown";
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
 import flushPromises from "flush-promises";
diff --git a/client/src/components/Workflow/WorkflowDropdown.vue b/client/src/components/Workflow/WorkflowDropdown.vue
index 07278aaa76f..ae80369a1c3 100644
--- a/client/src/components/Workflow/WorkflowDropdown.vue
+++ b/client/src/components/Workflow/WorkflowDropdown.vue
@@ -80,7 +80,7 @@
 </template>
 <script>
 import { Services } from "./services";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { library } from "@fortawesome/fontawesome-svg-core";
@@ -98,22 +98,22 @@ export default {
             return `/workflows/edit?id=${this.workflow.id}`;
         },
         urlDownload() {
-            return safePath(`/api/workflows/${this.workflow.id}/download?format=json-download`);
+            return withPrefix(`/api/workflows/${this.workflow.id}/download?format=json-download`);
         },
         urlShare() {
             return `/workflows/sharing?id=${this.workflow.id}`;
         },
         urlExport() {
-            return safePath(`/workflows/export?id=${this.workflow.id}`);
+            return withPrefix(`/workflows/export?id=${this.workflow.id}`);
         },
         urlView() {
-            return safePath(`/published/workflow?id=${this.workflow.id}`);
+            return withPrefix(`/published/workflow?id=${this.workflow.id}`);
         },
         urlInvocations() {
             return `/workflows/${this.workflow.id}/invocations`;
         },
         urlViewShared() {
-            return safePath(
+            return withPrefix(
                 `/workflow/display_by_username_and_slug?username=${this.workflow.owner}&slug=${encodeURIComponent(
                     this.workflow.slug
                 )}`
diff --git a/client/src/components/Workflow/WorkflowExport.test.js b/client/src/components/Workflow/WorkflowExport.test.js
index 1260a27a330..523b4fe2c05 100644
--- a/client/src/components/Workflow/WorkflowExport.test.js
+++ b/client/src/components/Workflow/WorkflowExport.test.js
@@ -1,5 +1,5 @@
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import flushPromises from "flush-promises";
 import MockAdapter from "axios-mock-adapter";
 
diff --git a/client/src/components/Workflow/WorkflowExport.vue b/client/src/components/Workflow/WorkflowExport.vue
index 17b423cfc4c..f0fd6fabad2 100644
--- a/client/src/components/Workflow/WorkflowExport.vue
+++ b/client/src/components/Workflow/WorkflowExport.vue
@@ -55,7 +55,7 @@
 <script>
 import Vue from "vue";
 import BootstrapVue from "bootstrap-vue";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 import { urlData } from "utils/url";
 import LoadingSpan from "components/LoadingSpan";
 Vue.use(BootstrapVue);
@@ -78,18 +78,18 @@ export default {
     },
     computed: {
         downloadUrl() {
-            return safePath(`/api/workflows/${this.workflow.id}/download?format=json-download`);
+            return withPrefix(`/api/workflows/${this.workflow.id}/download?format=json-download`);
         },
         importUrl() {
             const location = window.location;
-            const url = safePath(`/u/${this.workflow.owner}/w/${this.workflow.slug}/json`);
+            const url = withPrefix(`/u/${this.workflow.owner}/w/${this.workflow.slug}/json`);
             return `${location.protocol}//${location.host}${url}`;
         },
         myExperimentUrl() {
-            return safePath(`/workflow/export_to_myexp?id=${this.workflow.id}`);
+            return withPrefix(`/workflow/export_to_myexp?id=${this.workflow.id}`);
         },
         svgUrl() {
-            return safePath(`/workflow/gen_image?id=${this.workflow.id}`);
+            return withPrefix(`/workflow/gen_image?id=${this.workflow.id}`);
         },
     },
     watch: {
diff --git a/client/src/components/Workflow/WorkflowIndexActions.test.js b/client/src/components/Workflow/WorkflowIndexActions.test.js
index 067c94caa28..b8479ee1b9d 100644
--- a/client/src/components/Workflow/WorkflowIndexActions.test.js
+++ b/client/src/components/Workflow/WorkflowIndexActions.test.js
@@ -1,6 +1,6 @@
 import WorkflowIndexActions from "./WorkflowIndexActions";
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import { ROOT_COMPONENT } from "utils/navigation";
 import VueRouter from "vue-router";
 
diff --git a/client/src/components/Workflow/WorkflowList.vue b/client/src/components/Workflow/WorkflowList.vue
index 306a33abbb9..02069b4907b 100644
--- a/client/src/components/Workflow/WorkflowList.vue
+++ b/client/src/components/Workflow/WorkflowList.vue
@@ -1,6 +1,9 @@
 <template>
     <div>
         <b-alert class="index-grid-message" :variant="messageVariant" :show="showMessage">{{ message }}</b-alert>
+        <b-alert class="index-grid-message" dismissible :variant="importStatus" :show="Boolean(importMessage)">
+            {{ importMessage }}
+        </b-alert>
         <b-row class="mb-3">
             <b-col cols="6" class="m-1">
                 <index-filter
@@ -151,6 +154,14 @@ export default {
             type: Number,
             default: 500,
         },
+        importMessage: {
+            type: String,
+            default: null,
+        },
+        importStatus: {
+            type: String,
+            default: "success",
+        },
     },
     data() {
         return {
diff --git a/client/src/components/Workflow/WorkflowRunButton.test.js b/client/src/components/Workflow/WorkflowRunButton.test.js
index 7a07f20fed1..c7a9ad84e1b 100644
--- a/client/src/components/Workflow/WorkflowRunButton.test.js
+++ b/client/src/components/Workflow/WorkflowRunButton.test.js
@@ -1,6 +1,6 @@
 import WorkflowRunButton from "./WorkflowRunButton";
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import { ROOT_COMPONENT } from "utils/navigation";
 
 import "jest-location-mock";
diff --git a/client/src/components/Workflow/Workflows.test.js b/client/src/components/Workflow/Workflows.test.js
index 9bc8ad72159..01ea9efebd0 100644
--- a/client/src/components/Workflow/Workflows.test.js
+++ b/client/src/components/Workflow/Workflows.test.js
@@ -2,7 +2,7 @@ import Workflows from "../Workflow/WorkflowList";
 import { mount } from "@vue/test-utils";
 import axios from "axios";
 import MockAdapter from "axios-mock-adapter";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import flushPromises from "flush-promises";
 import { parseISO, formatDistanceToNow } from "date-fns";
 
diff --git a/client/src/components/Workflow/redirectPath.ts b/client/src/components/Workflow/redirectPath.ts
new file mode 100644
index 00000000000..4bf9dfd79e2
--- /dev/null
+++ b/client/src/components/Workflow/redirectPath.ts
@@ -0,0 +1,23 @@
+import type { RawLocation } from "vue-router";
+
+const statusMap = new Map([
+    ["error", "danger"],
+    ["success", "success"],
+]);
+
+export function getRedirectOnImportPath(
+    response: { id?: string; message?: string; status?: string },
+    isRunFormRedirect = false
+): RawLocation {
+    if (isRunFormRedirect) {
+        return { path: "/workflows/run", query: { id: response.id } };
+    } else {
+        return {
+            path: "/workflows/list",
+            query: {
+                message: response.message ?? "Import Successful",
+                status: statusMap.get(response.status ?? "") ?? "success",
+            },
+        };
+    }
+}
diff --git a/client/src/components/Workflow/services.js b/client/src/components/Workflow/services.js
index 93a0833b8e1..4a0d78e1f4f 100644
--- a/client/src/components/Workflow/services.js
+++ b/client/src/components/Workflow/services.js
@@ -1,13 +1,13 @@
 import axios from "axios";
 import { getGalaxyInstance } from "app";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 import { rethrowSimple } from "utils/simple-error";
 
 /** Workflow data request helper **/
 export class Services {
     async copyWorkflow(workflow) {
         const Galaxy = getGalaxyInstance();
-        const url = safePath(`/api/workflows/${workflow.id}/download`);
+        const url = withPrefix(`/api/workflows/${workflow.id}/download`);
         try {
             const response = await axios.get(url);
             const newWorkflow = response.data;
@@ -17,7 +17,7 @@ export class Services {
                 newName += ` shared by user ${currentOwner}`;
             }
             newWorkflow.name = newName;
-            const createUrl = safePath("/api/workflows");
+            const createUrl = withPrefix("/api/workflows");
             const createResponse = await axios.post(createUrl, { workflow: newWorkflow });
             const createWorkflow = createResponse.data;
             this._addAttributes(createWorkflow);
@@ -28,7 +28,7 @@ export class Services {
     }
 
     async deleteWorkflow(id) {
-        const url = safePath(`/api/workflows/${id}`);
+        const url = withPrefix(`/api/workflows/${id}`);
         try {
             const response = await axios.delete(url);
             return response.data;
@@ -38,7 +38,7 @@ export class Services {
     }
 
     async undeleteWorkflow(id) {
-        const url = safePath(`/api/workflows/${id}/undelete`);
+        const url = withPrefix(`/api/workflows/${id}/undelete`);
         try {
             const response = await axios.post(url);
             return response.data;
@@ -48,7 +48,7 @@ export class Services {
     }
 
     async updateWorkflow(id, data) {
-        const url = safePath(`/api/workflows/${id}`);
+        const url = withPrefix(`/api/workflows/${id}`);
         try {
             const response = await axios.put(url, data);
             return response.data;
@@ -70,7 +70,7 @@ export class Services {
     }
 
     async getTrsServers() {
-        const url = safePath("/api/trs_consume/servers");
+        const url = withPrefix("/api/trs_consume/servers");
         try {
             const response = await axios.get(url);
             return response.data;
@@ -86,7 +86,7 @@ export class Services {
         // better than the alternatives IMO. -John
         // https://github.com/pallets/flask/issues/900
         toolId = btoa(toolId);
-        const url = safePath(`/api/trs_consume/${trsServer}/tools/${toolId}?tool_id_b64_encoded=true`);
+        const url = withPrefix(`/api/trs_consume/${trsServer}/tools/${toolId}?tool_id_b64_encoded=true`);
         try {
             const response = await axios.get(url);
             return response.data;
@@ -102,7 +102,21 @@ export class Services {
             trs_tool_id: toolId,
             trs_version_id: versionId,
         };
-        const url = safePath("/api/workflows");
+        const url = withPrefix("/api/workflows");
+        try {
+            const response = await axios.post(url, data);
+            return response.data;
+        } catch (e) {
+            rethrowSimple(e);
+        }
+    }
+
+    async importTrsToolFromUrl(trsUrl) {
+        const data = {
+            archive_source: "trs_tool",
+            trs_url: trsUrl,
+        };
+        const url = withPrefix("/api/workflows");
         try {
             const response = await axios.post(url, data);
             return response.data;
diff --git a/client/src/components/Workflow/utils.js b/client/src/components/Workflow/utils.js
deleted file mode 100644
index 03c8d7634be..00000000000
--- a/client/src/components/Workflow/utils.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export function redirectOnImport(appRoot, response, isRunFormRedirect = false) {
-    isRunFormRedirect
-        ? (window.location = `${appRoot}workflows/run?id=${response.id}`)
-        : (window.location = `${appRoot}workflows/list?message=${response.message}&status=success`);
-}
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.test.js b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.test.js
index a751c05a1e8..de51f897b00 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.test.js
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.test.js
@@ -1,6 +1,6 @@
 import WorkflowInvocationState from "./WorkflowInvocationState";
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import Vuex from "vuex";
 import invocationData from "../Workflow/test/json/invocation.json";
 
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationSummary.test.js b/client/src/components/WorkflowInvocationState/WorkflowInvocationSummary.test.js
index 12486f60649..7fca386aa08 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationSummary.test.js
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationSummary.test.js
@@ -1,6 +1,6 @@
 import WorkflowInvocationSummary from "./WorkflowInvocationSummary";
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import Vuex from "vuex";
 import invocationData from "../Workflow/test/json/invocation.json";
 
diff --git a/client/src/components/admin/BaseList.test.js b/client/src/components/admin/BaseList.test.js
index 4b1c7df8019..f9b5d3a57b7 100644
--- a/client/src/components/admin/BaseList.test.js
+++ b/client/src/components/admin/BaseList.test.js
@@ -1,5 +1,5 @@
 import { mount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import BaseList from "./BaseList";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/admin/JobLock.vue b/client/src/components/admin/JobLock.vue
index 0ec380e2926..237231bdd96 100644
--- a/client/src/components/admin/JobLock.vue
+++ b/client/src/components/admin/JobLock.vue
@@ -1,45 +1,33 @@
+<script setup lang="ts">
+import { ref, watch, onMounted } from "vue";
+import { fetcher } from "@/schema";
+
+const jobLock = ref(false);
+const jobLockUpdating = ref(true);
+
+const jobLockStatus = fetcher.path("/api/job_lock").method("get").create();
+const jobLockUpdate = fetcher.path("/api/job_lock").method("put").create();
+
+watch(jobLock, async (newVal) => {
+    jobLockUpdating.value = true;
+    const { data } = await jobLockUpdate({ active: jobLock.value });
+    jobLock.value = data.active;
+    jobLockUpdating.value = false;
+});
+
+onMounted(async () => {
+    // TODO: see if we can upstream an optional arg when no params are required?
+    // i.e. jobLockStatus() instead of jobLockStatus({})
+    const response = await jobLockStatus({});
+    jobLock.value = response.data.active;
+    jobLockUpdating.value = false;
+});
+</script>
 <template>
     <b-form-group>
-        <b-form-checkbox id="prevent-job-dispatching" v-model="jobLock" switch size="lg">
+        <b-form-checkbox id="prevent-job-dispatching" v-model="jobLock" :disabled="jobLockUpdating" switch size="lg">
             Job dispatching is currently
-            <strong>{{ jobLockDisplay ? "locked" : "unlocked" }}</strong>
+            <strong>{{ jobLock ? "locked" : "unlocked" }}</strong>
         </b-form-checkbox>
     </b-form-group>
 </template>
-
-<script>
-import { getAppRoot } from "onload/loadConfig";
-import axios from "axios";
-
-export default {
-    data() {
-        return {
-            jobLock: false,
-            jobLockDisplay: false,
-        };
-    },
-    watch: {
-        jobLock(newVal) {
-            this.handleJobLock(axios.put(`${getAppRoot()}api/job_lock`, { active: this.jobLock }));
-        },
-    },
-    created() {
-        this.initJobLock();
-    },
-    methods: {
-        initJobLock() {
-            this.handleJobLock(axios.get(`${getAppRoot()}api/job_lock`));
-        },
-        handleJobLock(axiosPromise) {
-            axiosPromise
-                .then((response) => {
-                    this.jobLock = response.data.active;
-                    this.jobLockDisplay = response.data.active;
-                })
-                .catch((error) => {
-                    console.error(error);
-                });
-        },
-    },
-};
-</script>
diff --git a/client/src/components/providers/UserHistories.test.js b/client/src/components/providers/UserHistories.test.js
index f43a7e551d4..463ab5219cf 100644
--- a/client/src/components/providers/UserHistories.test.js
+++ b/client/src/components/providers/UserHistories.test.js
@@ -1,6 +1,6 @@
 import Vuex from "vuex";
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import { historyStore } from "store/historyStore/historyStore";
 import UserHistories from "./UserHistories";
 import {
diff --git a/client/src/components/providers/storeProviders.js b/client/src/components/providers/storeProviders.js
index f4df9359fd2..ff1a16d0154 100644
--- a/client/src/components/providers/storeProviders.js
+++ b/client/src/components/providers/storeProviders.js
@@ -192,5 +192,4 @@ export const StoreProvider = (storeAction, storeGetter, storeCountGetter = undef
 
 export const DatasetProvider = StoreProvider("fetchDataset", "getDataset");
 export const CollectionElementsProvider = StoreProvider("fetchCollectionElements", "getCollectionElements");
-export const HistoryItemsProvider = StoreProvider("fetchHistoryItems", "getHistoryItems", "getTotalMatchesCount");
 export const ToolsProvider = StoreProvider("fetchAllTools", "getTools");
diff --git a/client/src/composables/datatypes.js b/client/src/composables/datatypes.js
deleted file mode 100644
index 15aa61ce8cd..00000000000
--- a/client/src/composables/datatypes.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import { ref } from "vue";
-import axios from "axios";
-import { getAppRoot } from "onload/loadConfig";
-
-/**
- * Fetches a detailed array of datatypes available on this galaxy instance.
- * Does not cache the result or use a store.
- */
-export function useDetailedDatatypes() {
-    const datatypesLoading = ref(true);
-    const datatypes = ref([]);
-
-    async function getDatatypes() {
-        try {
-            const datatypesPromise = axios.get(`${getAppRoot()}api/datatypes?extension_only=false`);
-            const datatypeEDAMFormatsPromise = axios.get(`${getAppRoot()}api/datatypes/edam_formats/detailed`);
-            const datatypeEDAMDataPromise = axios.get(`${getAppRoot()}api/datatypes/edam_data/detailed`);
-
-            const [baseTypes, datatypeEDAMFormats, datatypeEDAMData] = await Promise.all([
-                datatypesPromise,
-                datatypeEDAMFormatsPromise,
-                datatypeEDAMDataPromise,
-            ]);
-
-            datatypes.value = baseTypes.data.map((type, i) => {
-                const typeEDAMFormat = datatypeEDAMFormats.data[type.extension] ?? null;
-                const typeEDAMData = datatypeEDAMData.data[type.extension] ?? null;
-
-                return {
-                    extension: type.extension,
-                    description: type.description,
-                    descriptionUrl: type.description_url,
-                    edamFormat: typeEDAMFormat.prefix_IRI,
-                    edamFormatLabel: typeEDAMFormat.label,
-                    edamFormatDefinition: typeEDAMFormat.definition,
-                    edamData: typeEDAMData.prefix_IRI,
-                    edamDataLabel: typeEDAMData.label,
-                    edamDataDefinition: typeEDAMData.definition,
-                };
-            });
-        } catch (e) {
-            console.error("unable to fetch available datatypes\n", e);
-        } finally {
-            datatypesLoading.value = false;
-        }
-    }
-
-    getDatatypes();
-
-    return { datatypes, datatypesLoading };
-}
diff --git a/client/src/composables/datatypes.ts b/client/src/composables/datatypes.ts
new file mode 100644
index 00000000000..88a38f045f4
--- /dev/null
+++ b/client/src/composables/datatypes.ts
@@ -0,0 +1,70 @@
+import { ref } from "vue";
+import { fetcher } from "@/schema";
+
+import type { Ref } from "vue";
+
+const datatypesFetcher = fetcher.path("/api/datatypes").method("get").create();
+const edamFormatsFetcher = fetcher.path("/api/datatypes/edam_formats/detailed").method("get").create();
+const edamDataFetcher = fetcher.path("/api/datatypes/edam_data/detailed").method("get").create();
+
+export interface DetailedDatatypes {
+    extension: string;
+    description?: string;
+    descriptionUrl?: string;
+    edamFormat?: string;
+    edamFormatLabel?: string;
+    edamFormatDefinition?: string;
+    edamData?: string;
+    edamDataLabel?: string;
+    edamDataDefinition?: string;
+}
+
+/**
+ * Fetches a detailed array of datatypes available on this galaxy instance.
+ * Does not cache the result or use a store.
+ */
+export function useDetailedDatatypes() {
+    const datatypesLoading = ref(true);
+    const datatypes: Ref<DetailedDatatypes[]> = ref([]);
+
+    async function getDatatypes() {
+        try {
+            const datatypesPromise = datatypesFetcher({ extension_only: true });
+            const datatypeEDAMFormatsPromise = edamFormatsFetcher({});
+            const datatypeEDAMDataPromise = edamDataFetcher({});
+
+            const [baseTypes, datatypeEDAMFormats, datatypeEDAMData] = await Promise.all([
+                datatypesPromise,
+                datatypeEDAMFormatsPromise,
+                datatypeEDAMDataPromise,
+            ]);
+
+            type BaseTypes = Exclude<typeof baseTypes.data, string[]>;
+
+            datatypes.value = (baseTypes.data as BaseTypes).map((type) => {
+                const typeEDAMFormat = datatypeEDAMFormats.data[type.extension] ?? null;
+                const typeEDAMData = datatypeEDAMData.data[type.extension] ?? null;
+
+                return {
+                    extension: type.extension,
+                    description: type.description,
+                    descriptionUrl: type.description_url,
+                    edamFormat: typeEDAMFormat?.prefix_IRI,
+                    edamFormatLabel: typeEDAMFormat?.label,
+                    edamFormatDefinition: typeEDAMFormat?.definition,
+                    edamData: typeEDAMData?.prefix_IRI,
+                    edamDataLabel: typeEDAMData?.label,
+                    edamDataDefinition: typeEDAMData?.definition,
+                };
+            });
+        } catch (e) {
+            console.error("unable to fetch available datatypes\n", e);
+        } finally {
+            datatypesLoading.value = false;
+        }
+    }
+
+    getDatatypes();
+
+    return { datatypes, datatypesLoading };
+}
diff --git a/client/src/composables/datatypesMapper.ts b/client/src/composables/datatypesMapper.ts
new file mode 100644
index 00000000000..f724117734e
--- /dev/null
+++ b/client/src/composables/datatypesMapper.ts
@@ -0,0 +1,34 @@
+import { ref } from "vue";
+
+import type { Ref } from "vue";
+
+import type { DatatypesMapperModel } from "@/components/Datatypes/model";
+import { useDatatypesMapperStore } from "@/stores/datatypesMapperStore";
+
+export function useDatatypesMapper() {
+    const datatypesMapperLoading = ref(true);
+    const datatypesMapper: Ref<DatatypesMapperModel | null> = ref(null);
+    const datatypesMapperStore = useDatatypesMapperStore();
+    const datatypes: Ref<string[]> = ref([]);
+
+    async function getDatatypesMapper() {
+        try {
+            await datatypesMapperStore.createMapper();
+            datatypesMapper.value = datatypesMapperStore.datatypesMapper;
+            if (datatypesMapperStore.datatypesMapper) {
+                datatypes.value = datatypesMapperStore.datatypesMapper.datatypes;
+            }
+        } catch (e) {
+            console.error("unable to create datatypes mapper\n", e);
+        } finally {
+            datatypesMapperLoading.value = false;
+        }
+        if (!datatypesMapperStore.datatypesMapper) {
+            throw "Error creating datatypesMapper";
+        }
+    }
+
+    getDatatypesMapper();
+
+    return { datatypes, datatypesMapper, datatypesMapperLoading };
+}
diff --git a/client/src/composables/fileDrop.js b/client/src/composables/fileDrop.js
new file mode 100644
index 00000000000..76e8ed1609f
--- /dev/null
+++ b/client/src/composables/fileDrop.js
@@ -0,0 +1,107 @@
+import { ref, unref } from "vue";
+import { useEventListener } from "@vueuse/core";
+
+/**
+ * Custom File-Drop composable
+ * @param dropZone Element which files should be dropped on
+ * @param onDrop callback function called when drop occurs
+ * @param solo when true, only reacts if no modal is open
+ */
+export function useFileDrop(dropZone, onDrop, solo) {
+    const isFileOverDocument = ref(false);
+    const isFileOverDropZone = ref(false);
+
+    const dragBlocked = ref(false);
+
+    // Don't react to page-internal drag events
+    useEventListener(
+        document.body,
+        "dragstart",
+        () => {
+            dragBlocked.value = true;
+        },
+        true
+    );
+
+    useEventListener(
+        document.body,
+        "dragover",
+        (event) => {
+            if (!dragBlocked.value) {
+                // prevent the browser from opening the file
+                event.preventDefault();
+            }
+        },
+        true
+    );
+
+    useEventListener(
+        document.body,
+        "drop",
+        (event) => {
+            if (!dragBlocked.value) {
+                // prevent the browser from opening the file
+                event.preventDefault();
+
+                if (isFileOverDropZone.value && isFileOverDocument.value) {
+                    unref(onDrop)(event);
+                }
+            }
+            isFileOverDocument.value = false;
+            dragBlocked.value = false;
+        },
+        true
+    );
+
+    useEventListener(
+        document.body,
+        "dragend",
+        () => {
+            // reset on drag end
+            isFileOverDocument.value = false;
+            isFileOverDropZone.value = false;
+            dragBlocked.value = false;
+        },
+        true
+    );
+
+    useEventListener(
+        document.body,
+        "dragenter",
+        (event) => {
+            // init values if drag is possible
+            if (!dragBlocked.value && !(unref(solo) && isAnyModalOpen())) {
+                isFileOverDocument.value = true;
+                isFileOverDropZone.value = false;
+
+                event.preventDefault();
+            }
+        },
+        true
+    );
+
+    /** returns if any bootstrap modal is open */
+    function isAnyModalOpen() {
+        return document.querySelectorAll(".modal.show").length > 0;
+    }
+
+    useEventListener(
+        dropZone,
+        "dragenter",
+        () => {
+            isFileOverDropZone.value = true;
+        },
+        true
+    );
+
+    useEventListener(
+        dropZone,
+        "dragleave",
+        () => {
+            isFileOverDropZone.value = false;
+        },
+        true
+    );
+
+    return { isFileOverDocument, isFileOverDropZone };
+}
diff --git a/client/src/composables/fileSources.js b/client/src/composables/fileSources.js
new file mode 100644
index 00000000000..8bb5b18ca58
--- /dev/null
+++ b/client/src/composables/fileSources.js
@@ -0,0 +1,34 @@
+import { ref, readonly, onMounted } from "vue";
+import { Services } from "components/FilesDialog/services";
+
+const fileSourcesService = new Services();
+
+/**
+ * Composable for accessing and working with file sources.
+ */
+export function useFileSources() {
+    const isLoading = ref(true);
+    const hasWritable = ref(false);
+    const fileSources = ref([]);
+
+    onMounted(async () => {
+        fileSources.value = await fileSourcesService.getFileSources();
+        hasWritable.value = fileSources.value.some((fs) => fs.writable);
+        isLoading.value = false;
+    });
+
+    return {
+        /**
+         * The list of available file sources from the server.
+         */
+        fileSources: readonly(fileSources),
+        /**
+         * Whether the file sources are being loaded from the server.
+         */
+        isLoading: readonly(isLoading),
+        /**
+         * Whether the user can write files to any of the available file sources.
+         */
+        hasWritable: readonly(hasWritable),
+    };
+}
diff --git a/client/src/composables/formattedToolHelp.js b/client/src/composables/formattedToolHelp.js
new file mode 100644
index 00000000000..3c272bdb5a1
--- /dev/null
+++ b/client/src/composables/formattedToolHelp.js
@@ -0,0 +1,64 @@
+import { computed, unref } from "vue";
+import { getAppRoot } from "onload/loadConfig";
+
+/**
+ * Increase the heading levels of all child nodes of a node
+ * @param {HTMLElement} node
+ * @param {number} increaseBy
+ */
+function increaseHeadingLevels(node, increaseBy) {
+    [5, 4, 3, 2, 1].forEach((level) => {
+        increaseHeadingLevel(node, level, increaseBy);
+    });
+}
+
+/**
+ * Increase a single heading level
+ */
+function increaseHeadingLevel(node, level, increaseBy) {
+    // cap target level at 6 (highest heading level)
+    let targetLevel = level + increaseBy;
+    if (targetLevel > 6) {
+        targetLevel = 6;
+    }
+
+    const headings = node.getElementsByTagName(`h${level}`);
+
+    // create new headings with target level and copy contents + attributes
+    Array.from(headings).forEach((heading) => {
+        const newTag = document.createElement(`h${targetLevel}`);
+        newTag.innerHTML = heading.innerHTML;
+
+        Array.from(heading.attributes).forEach((attribute) => {
+            newTag.setAttribute(attribute.name, attribute.value);
+        });
+
+        heading.insertAdjacentElement("beforebegin", newTag);
+        heading.remove();
+    });
+}
+
+export function useFormattedToolHelp(helpContent, headingLevelIncrease = 2) {
+    const formattedContent = computed(() => {
+        const node = document.createElement("div");
+        node.innerHTML = unref(helpContent);
+
+        const links = node.getElementsByTagName("a");
+        Array.from(links).forEach((link) => {
+            link.target = "_blank";
+        });
+
+        const images = node.getElementsByTagName("img");
+        Array.from(images).forEach((image) => {
+            if (image.src.includes("admin_toolshed")) {
+                image.src = getAppRoot() + image.src;
+            }
+        });
+
+        increaseHeadingLevels(node, unref(headingLevelIncrease));
+
+        return node.innerHTML;
+    });
+
+    return { formattedContent };
+}
diff --git a/client/src/composables/globalUploadModal.js b/client/src/composables/globalUploadModal.js
new file mode 100644
index 00000000000..9020d7c6daf
--- /dev/null
+++ b/client/src/composables/globalUploadModal.js
@@ -0,0 +1,16 @@
+import { ref } from "vue";
+
+let modal = ref(null);
+
+export function setGlobalUploadModal(modalRef) {
+    // eslint-disable-next-line vue/no-ref-as-operand
+    modal = modalRef;
+}
+
+export function useGlobalUploadModal() {
+    const openGlobalUploadModal = (options) => {
+        modal.value?.open(options);
+    };
+
+    return { openGlobalUploadModal };
+}
diff --git a/client/src/composables/sensors/animationFrame.js b/client/src/composables/sensors/animationFrame.ts
similarity index 72%
rename from client/src/composables/sensors/animationFrame.js
rename to client/src/composables/sensors/animationFrame.ts
index f2199e6bded..9505000019c 100644
--- a/client/src/composables/sensors/animationFrame.js
+++ b/client/src/composables/sensors/animationFrame.ts
@@ -1,9 +1,11 @@
 import { onScopeDispose } from "vue";
 
-const callbacks = [];
-var loopActive = false;
+type CallbackFunction = (timestamp: number) => void;
 
-function animationFrameLoop(timestamp) {
+const callbacks: CallbackFunction[] = [];
+let loopActive = false;
+
+function animationFrameLoop(timestamp: number) {
     callbacks.forEach((callback) => {
         callback(timestamp);
     });
@@ -15,10 +17,10 @@ function animationFrameLoop(timestamp) {
  * Runs a callback in the browsers animation loop.
  * This can serve as a performance effective alternative for frequently firing events (eg, scroll events)
  * @see https://developer.mozilla.org/en-US/docs/Web/API/window/requestAnimationFrame
- * @param {function} callback
+ * @param callback
  * @returns a stop function, to remove the callback from the animation loop
  */
-export function useAnimationFrame(callback) {
+export function useAnimationFrame(callback: CallbackFunction) {
     callbacks.push(callback);
 
     if (!loopActive) {
@@ -27,7 +29,7 @@ export function useAnimationFrame(callback) {
     }
 
     const stop = () => {
-        var index = callbacks.indexOf(callback);
+        const index = callbacks.indexOf(callback);
 
         if (index !== -1) {
             callbacks.splice(index, 1);
diff --git a/client/src/composables/sensors/animationFrameResizeObserver.js b/client/src/composables/sensors/animationFrameResizeObserver.js
deleted file mode 100644
index f49a65d87c4..00000000000
--- a/client/src/composables/sensors/animationFrameResizeObserver.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { useAnimationFrame } from "./animationFrame";
-import { unref } from "vue";
-
-export function useAnimationFrameResizeObserver(element, callback) {
-    var lastSize = { width: 0, height: 0 };
-
-    const { stop } = useAnimationFrame(() => {
-        const el = unref(element);
-        const width = el.offsetWidth;
-        const height = el.offsetHeight;
-
-        if (lastSize.width !== width || lastSize.height !== height) {
-            callback({ width, height }, lastSize);
-            lastSize = { width, height };
-        }
-    });
-
-    return { stop };
-}
diff --git a/client/src/composables/sensors/animationFrameResizeObserver.ts b/client/src/composables/sensors/animationFrameResizeObserver.ts
new file mode 100644
index 00000000000..e47af25556f
--- /dev/null
+++ b/client/src/composables/sensors/animationFrameResizeObserver.ts
@@ -0,0 +1,45 @@
+import { useAnimationFrame } from "./animationFrame";
+import type { MaybeComputedRef } from "@vueuse/core";
+import { resolveUnref } from "@vueuse/core";
+
+export type Size = { width: number; height: number };
+type CallbackValue = { clientSize: Size; scrollSize: Size };
+export type AnimationFrameResizeObserverCallback = (newValue: CallbackValue, oldValue: CallbackValue) => void;
+
+export function useAnimationFrameResizeObserver(
+    element: MaybeComputedRef<HTMLElement | null>,
+    callback: AnimationFrameResizeObserverCallback
+) {
+    let clientSize = { width: 0, height: 0 };
+    let scrollSize = { width: 0, height: 0 };
+
+    const isSameSize = (a: Size, b: Size) => {
+        return a.width === b.width && a.height === b.height;
+    };
+
+    const { stop } = useAnimationFrame(() => {
+        const el = resolveUnref(element);
+
+        if (!el) {
+            return;
+        }
+
+        const newClientSize = {
+            width: el.clientWidth,
+            height: el.clientHeight,
+        };
+
+        const newScrollSize = {
+            width: el.scrollWidth,
+            height: el.scrollHeight,
+        };
+
+        if (!isSameSize(clientSize, newClientSize) || !isSameSize(scrollSize, newScrollSize)) {
+            callback({ clientSize: newClientSize, scrollSize: newScrollSize }, { clientSize, scrollSize });
+            clientSize = newClientSize;
+            scrollSize = newScrollSize;
+        }
+    });
+
+    return { stop };
+}
diff --git a/client/src/composables/sensors/animationFrameScroll.js b/client/src/composables/sensors/animationFrameScroll.ts
similarity index 72%
rename from client/src/composables/sensors/animationFrameScroll.js
rename to client/src/composables/sensors/animationFrameScroll.ts
index 81f1c8325b0..e79ebe752b2 100644
--- a/client/src/composables/sensors/animationFrameScroll.js
+++ b/client/src/composables/sensors/animationFrameScroll.ts
@@ -1,7 +1,9 @@
 import { useAnimationFrame } from "./animationFrame";
-import { reactive, ref, unref } from "vue";
+import { reactive, ref } from "vue";
+import type { MaybeComputedRef } from "@vueuse/core";
+import { resolveUnref } from "@vueuse/core";
 
-export function useAnimationFrameScroll(element) {
+export function useAnimationFrameScroll(element: MaybeComputedRef<HTMLElement | null>) {
     const scrollLeft = ref(0);
     const scrollTop = ref(0);
 
@@ -13,7 +15,12 @@ export function useAnimationFrameScroll(element) {
     });
 
     const { stop } = useAnimationFrame(() => {
-        const el = unref(element);
+        const el = resolveUnref(element);
+
+        if (!el) {
+            return;
+        }
+
         const left = el.scrollLeft;
 
         if (left !== scrollLeft.value) {
diff --git a/client/src/composables/shortTermStorage.js b/client/src/composables/shortTermStorage.js
new file mode 100644
index 00000000000..3e34d722681
--- /dev/null
+++ b/client/src/composables/shortTermStorage.js
@@ -0,0 +1,123 @@
+import { ref, readonly } from "vue";
+import axios from "axios";
+import { withPrefix } from "utils/redirect";
+import { rethrowSimple } from "utils/simple-error";
+
+export const DEFAULT_EXPORT_PARAMS = {
+    modelStoreFormat: "rocrate.zip",
+    includeFiles: true,
+    includeDeleted: false,
+    includeHidden: false,
+};
+
+const DEFAULT_POLL_DELAY = 1000;
+const DEFAULT_OPTIONS = { exportParams: DEFAULT_EXPORT_PARAMS, pollDelayInMs: DEFAULT_POLL_DELAY };
+
+/**
+ * Composable to simplify and reuse the logic for downloading objects using Galaxy's Short Term Storage system.
+ */
+export function useShortTermStorage() {
+    let timeout = null;
+    let pollDelay = DEFAULT_POLL_DELAY;
+
+    const isPreparing = ref(false);
+
+    async function downloadHistory(historyId, options = DEFAULT_OPTIONS) {
+        return prepareObjectDownload(historyId, "histories", options);
+    }
+
+    async function downloadWorkflowInvocation(invocationId, options = DEFAULT_OPTIONS) {
+        return prepareObjectDownload(invocationId, "invocations", options);
+    }
+
+    function downloadObjectByRequestId(storageRequestId) {
+        const url = withPrefix(`/api/short_term_storage/${storageRequestId}`);
+        window.location.assign(url);
+    }
+
+    async function prepareObjectDownload(object_id, object_api, options = DEFAULT_OPTIONS) {
+        const finalOptions = Object.assign(DEFAULT_OPTIONS, options);
+        resetTimeout();
+        isPreparing.value = true;
+        pollDelay = finalOptions.pollDelayInMs;
+        const url = withPrefix(`/api/${object_api}/${object_id}/prepare_store_download`);
+        const exportParams = {
+            model_store_format: finalOptions.exportParams.modelStoreFormat,
+            include_files: finalOptions.exportParams.includeFiles,
+            include_deleted: finalOptions.exportParams.includeDeleted,
+            include_hidden: finalOptions.exportParams.includeHidden,
+        };
+
+        const response = await axios.post(url, exportParams).catch(handleError);
+        handleInitialize(response);
+    }
+
+    function handleInitialize(response) {
+        const storageRequestId = response.data.storage_request_id;
+        pollStorageRequestId(storageRequestId);
+    }
+
+    function pollStorageRequestId(storageRequestId) {
+        const url = withPrefix(`/api/short_term_storage/${storageRequestId}/ready`);
+        axios
+            .get(url)
+            .then((r) => {
+                handlePollResponse(r, storageRequestId);
+            })
+            .catch(handleError);
+    }
+
+    function handlePollResponse(response, storageRequestId) {
+        const ready = response.data;
+        if (ready) {
+            isPreparing.value = false;
+            downloadObjectByRequestId(storageRequestId);
+        } else {
+            pollAfterDelay(storageRequestId);
+        }
+    }
+
+    function handleError(err) {
+        rethrowSimple(err);
+        isPreparing.value = false;
+    }
+
+    function pollAfterDelay(storageRequestId) {
+        resetTimeout();
+        timeout = setTimeout(() => {
+            pollStorageRequestId(storageRequestId);
+        }, pollDelay);
+    }
+
+    function resetTimeout() {
+        if (timeout) {
+            clearTimeout(timeout);
+            timeout = null;
+        }
+    }
+
+    return {
+        /**
+         * Starts preparing a history download file. When `isPreparing` is false the download will start automatically.
+         * @param {String} historyId The ID of the history to be downloaded
+         * @param {Object} options Options for the download preparation
+         */
+        downloadHistory,
+        /**
+         * Starts preparing a workflow invocation download file. When `isPreparing` is false the download will start automatically.
+         * @param {String} invocationId The ID of the workflow invocation to be downloaded
+         * @param {Object} options Options for the download preparation
+         */
+        downloadWorkflowInvocation,
+        /**
+         * Starts a direct download of the object associated with the given `storageRequestId`.
+         * For the download to succeed, the associated `storageRequestId` must be `ready` and not in failure state.
+         * @param {String} storageRequestId The storage request ID associated to the object to be downloaded
+         */
+        downloadObjectByRequestId,
+        /**
+         * Whether the download is still being prepared.
+         */
+        isPreparing: readonly(isPreparing),
+    };
+}
diff --git a/client/src/composables/taskMonitor.js b/client/src/composables/taskMonitor.js
index 6accd775234..67c099e599a 100644
--- a/client/src/composables/taskMonitor.js
+++ b/client/src/composables/taskMonitor.js
@@ -4,13 +4,14 @@ import axios from "axios";
 const SUCCESS_STATE = "SUCCESS";
 const FAILURE_STATE = "FAILURE";
 const TASK_READY_STATES = [SUCCESS_STATE, FAILURE_STATE];
-const POLL_DELAY = 1000;
+const DEFAULT_POLL_DELAY = 1000;
 
 /**
  * Composable for waiting on Galaxy background tasks.
  */
 export function useTaskMonitor() {
     let timeout = null;
+    let pollDelay = DEFAULT_POLL_DELAY;
 
     const isRunning = ref(false);
     const status = ref(null);
@@ -21,7 +22,8 @@ export function useTaskMonitor() {
     const hasFailed = computed(() => status.value === FAILURE_STATE);
     const queryStateUrl = computed(() => `/api/tasks/${currentTaskId.value}/state`);
 
-    function waitForTask(taskId) {
+    function waitForTask(taskId, pollDelayInMs = DEFAULT_POLL_DELAY) {
+        pollDelay = pollDelayInMs;
         resetState();
         currentTaskId.value = taskId;
         isRunning.value = true;
@@ -46,7 +48,7 @@ export function useTaskMonitor() {
         resetTimeout();
         timeout = setTimeout(() => {
             fetchTaskStatus(taskId);
-        }, POLL_DELAY);
+        }, pollDelay);
     }
 
     function handleError(err) {
@@ -69,8 +71,9 @@ export function useTaskMonitor() {
     return {
         /**
          * Waits for a particular task ID to be completed.
-         * While the task is pending, the state will be updated every second by polling the server.
+         * While the task is pending, the state will be updated every `pollDelayInMs` by polling the server.
          * @param {string} taskId The task ID
+         * @param {Number} pollDelayInMs The time (milliseconds) between poll requests to update the task state.
          */
         waitForTask,
         /**
diff --git a/client/src/composables/toast.js b/client/src/composables/toast.js
deleted file mode 100644
index 0f19ef6a240..00000000000
--- a/client/src/composables/toast.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { ref } from "vue";
-
-let toastRef = ref(null);
-
-export const setToastComponentRef = (newRef) => {
-    // eslint-disable-next-line vue/no-ref-as-operand
-    toastRef = newRef;
-};
-
-/**
- * Direct export to simplify usage in Options Api component.
- * Use 'useToast' for the Composition Api instead.
- */
-export const Toast = {
-    success(message, title = "Success") {
-        toastRef.value.showToast(message, title, "success");
-    },
-
-    info(message, title = "Info") {
-        toastRef.value.showToast(message, title, "info");
-    },
-
-    warning(message, title = "Warning") {
-        toastRef.value.showToast(message, title, "warning");
-    },
-
-    error(message, title = "Error") {
-        toastRef.value.showToast(message, title, "error");
-    },
-};
-
-export function useToast() {
-    return { ...Toast };
-}
diff --git a/client/src/composables/toast.ts b/client/src/composables/toast.ts
new file mode 100644
index 00000000000..6589f3a0086
--- /dev/null
+++ b/client/src/composables/toast.ts
@@ -0,0 +1,39 @@
+import { ref, type Ref } from "vue";
+
+import type Vue from "vue";
+import type ToastComponentFile from "@/components/Toast";
+
+export type ToastComponent = Vue & typeof ToastComponentFile.methods;
+
+let toastRef: Ref<ToastComponent | null> = ref(null);
+
+export const setToastComponentRef = (newRef: typeof toastRef) => {
+    // eslint-disable-next-line vue/no-ref-as-operand
+    toastRef = newRef;
+};
+
+/**
+ * Direct export to simplify usage in Options Api component.
+ * Use 'useToast' for the Composition Api instead.
+ */
+export const Toast = {
+    success(message: string, title = "Success") {
+        toastRef.value?.showToast(message, title, "success");
+    },
+
+    info(message: string, title = "Info") {
+        toastRef.value?.showToast(message, title, "info");
+    },
+
+    warning(message: string, title = "Warning") {
+        toastRef.value?.showToast(message, title, "warning");
+    },
+
+    error(message: string, title = "Error") {
+        toastRef.value?.showToast(message, title, "error");
+    },
+};
+
+export function useToast() {
+    return { ...Toast };
+}
diff --git a/client/src/composables/useActiveElement.ts b/client/src/composables/useActiveElement.ts
new file mode 100644
index 00000000000..9b07c982d3f
--- /dev/null
+++ b/client/src/composables/useActiveElement.ts
@@ -0,0 +1,56 @@
+// https://github.com/vueuse/vueuse/blob/main/packages/core/_configurable.ts
+import { computedWithControl } from "@vueuse/shared";
+import { isClient } from "@vueuse/shared";
+import { useEventListener } from "@vueuse/core";
+import { unrefElement } from "@vueuse/core";
+
+import { computed } from "vue";
+
+import type { MaybeElementRef, UseFocusWithinReturn, ConfigurableWindow } from "@vueuse/core";
+
+const defaultWindow = isClient ? window : undefined;
+
+/**
+ * Reactive `document.activeElement`
+ *
+ * @see https://vueuse.org/useActiveElement
+ * @param options
+ */
+export function useActiveElement<T extends HTMLElement>(options: ConfigurableWindow = {}) {
+    const { window = defaultWindow } = options;
+    const activeElement = computedWithControl(
+        () => null,
+        () => window?.document.activeElement as T | null | undefined
+    );
+
+    if (window) {
+        useEventListener(
+            window,
+            "blur",
+            () => {
+                const scheduler = window.requestAnimationFrame || window.setTimeout;
+                scheduler(() => activeElement.trigger());
+            },
+            true
+        );
+        useEventListener(window, "focus", activeElement.trigger, true);
+    }
+    return activeElement;
+}
+
+/**
+ * Track if focus is contained within the target element
+ *
+ * @see https://vueuse.org/useFocusWithin
+ * @param target The target element to track
+ * @param options Focus within options
+ */
+export function useFocusWithin(target: MaybeElementRef, options: ConfigurableWindow = {}): UseFocusWithinReturn {
+    const activeElement = useActiveElement(options);
+    const targetElement = computed(() => unrefElement(target));
+    const focused = computed(() =>
+        targetElement.value && activeElement.value ? targetElement.value.contains(activeElement.value) : false
+    );
+
+    return { focused };
+}
diff --git a/client/src/composables/user.js b/client/src/composables/user.js
deleted file mode 100644
index 0910ec0ff7c..00000000000
--- a/client/src/composables/user.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { computed, onMounted, inject } from "vue";
-
-/**
- * composable user store wrapper
- * @returns currentUser computed
- */
-export function useCurrentUser() {
-    const store = inject("store");
-
-    const currentUser = computed(() => store.getters["user/currentUser"]);
-
-    onMounted(() => {
-        store.dispatch("user/loadUser");
-    });
-
-    const addFavoriteTool = async (toolId) => await store.dispatch("user/addFavoriteTool", toolId);
-    const removeFavoriteTool = async (toolId) => await store.dispatch("user/removeFavoriteTool", toolId);
-
-    return { currentUser, addFavoriteTool, removeFavoriteTool };
-}
diff --git a/client/src/composables/user.ts b/client/src/composables/user.ts
new file mode 100644
index 00000000000..557b576a3e3
--- /dev/null
+++ b/client/src/composables/user.ts
@@ -0,0 +1,64 @@
+import { computed, onMounted, inject, ref, unref } from "vue";
+import type { Ref } from "vue";
+import type { Store } from "vuex";
+
+// TODO: support computed for "noFetch"
+/**
+ * composable user store wrapper
+ * @param noFetch when true, the user will not be fetched from the server
+ * @returns currentUser computed
+ */
+export function useCurrentUser(noFetch: boolean | Ref<boolean> = false) {
+    // TODO: add store typing
+    const store = inject("store") as Store<unknown>;
+    const currentUser = computed(() => store.getters["user/currentUser"]);
+    const currentFavorites = computed(() => store.getters["user/currentFavorites"]);
+    onMounted(() => {
+        if (!unref(noFetch)) {
+            store.dispatch("user/loadUser");
+        }
+    });
+    const addFavoriteTool = async (toolId: string) => {
+        await store.dispatch("user/addFavoriteTool", toolId);
+    };
+    const removeFavoriteTool = async (toolId: string) => {
+        await store.dispatch("user/removeFavoriteTool", toolId);
+    };
+    return { currentUser, currentFavorites, addFavoriteTool, removeFavoriteTool };
+}
+
+export function useCurrentTheme() {
+    const store = inject("store") as Store<unknown>;
+    const currentTheme = computed(() => store.getters["user/currentTheme"]);
+    function setCurrentTheme(theme: string) {
+        store.dispatch("user/setCurrentTheme", theme);
+    }
+    return {
+        currentTheme,
+        setCurrentTheme,
+    };
+}
+
+// temporarily stores tags which have not yet been fetched from the backend
+const localTags = ref<string[]>([]);
+
+/**
+ * Keeps tracks of the tags the current user has used.
+ */
+export function useUserTags() {
+    const { currentUser } = useCurrentUser(true);
+    const userTags = computed(() => {
+        let tags: string[];
+        if (currentUser.value) {
+            tags = [...currentUser.value.tags_used, ...localTags.value];
+        } else {
+            tags = localTags.value;
+        }
+        const tagSet = new Set(tags);
+        return Array.from(tagSet).map((tag) => tag.replace(/^name:/, "#"));
+    });
+    const addLocalTag = (tag: string) => {
+        localTags.value.push(tag);
+    };
+    return { userTags, addLocalTag };
+}
diff --git a/client/src/composables/userHistories.js b/client/src/composables/userHistories.js
new file mode 100644
index 00000000000..9a5edd90f17
--- /dev/null
+++ b/client/src/composables/userHistories.js
@@ -0,0 +1,19 @@
+import { computed, watch, unref, inject } from "vue";
+
+export function useUserHistories(user) {
+    const store = inject("store");
+
+    watch(
+        () => unref(user),
+        (newUser, oldUser) => {
+            if (newUser?.id !== oldUser?.id) {
+                store.dispatch("history/loadHistories");
+            }
+        },
+        { immediate: true }
+    );
+
+    const currentHistoryId = computed(() => store.getters["history/currentHistoryId"]);
+
+    return { currentHistoryId };
+}
diff --git a/client/src/composables/utils/filter.js b/client/src/composables/utils/filter.ts
similarity index 51%
rename from client/src/composables/utils/filter.js
rename to client/src/composables/utils/filter.ts
index 9cc90750eb0..0553893fe7a 100644
--- a/client/src/composables/utils/filter.js
+++ b/client/src/composables/utils/filter.ts
@@ -1,4 +1,6 @@
-import { computed, unref } from "vue";
+import { computed } from "vue";
+import type { MaybeComputedRef } from "@vueuse/core";
+import { resolveUnref } from "@vueuse/core";
 
 /**
  * Reactively filter an array of objects, by comparing `filter` to all `fields`.
@@ -7,18 +9,24 @@ import { computed, unref } from "vue";
  * @param filter string to filter by
  * @param objectFields string array of fields to filter by on each object
  */
-export function useFilterObjectArray(array, filter, objectFields) {
+export function useFilterObjectArray<O extends object, K extends keyof O>(
+    array: MaybeComputedRef<Array<O>>,
+    filter: MaybeComputedRef<string>,
+    objectFields: MaybeComputedRef<Array<K>>
+) {
     const filtered = computed(() => {
-        const f = unref(filter).toLowerCase();
-        const arr = unref(array);
-        const fields = unref(objectFields);
+        const f = resolveUnref(filter).toLowerCase();
+        const arr = resolveUnref(array);
+        const fields = resolveUnref(objectFields);
 
         if (f === "") {
             return arr;
         } else {
             return arr.filter((obj) => {
                 for (const field of fields) {
-                    if (obj[field].toLowerCase().includes(f)) {
+                    const val = obj[field];
+
+                    if (typeof val === "string" && val.toLowerCase().includes(f)) {
                         return true;
                     }
                 }
diff --git a/client/src/composables/utils/uid.js b/client/src/composables/utils/uid.js
new file mode 100644
index 00000000000..812bc1edf7e
--- /dev/null
+++ b/client/src/composables/utils/uid.js
@@ -0,0 +1,14 @@
+import { computed, unref } from "vue";
+
+var idCounter = 0;
+
+/**
+ * Returns a page-unique id with and optional reactive prefix
+ */
+export function useUid(prefix = "") {
+    const id = idCounter;
+    idCounter += 1;
+
+    const uid = computed(() => `${unref(prefix)}${id}`);
+    return uid;
+}
diff --git a/client/src/entry/analysis/App.vue b/client/src/entry/analysis/App.vue
index d282079c426..1d7a900c1b0 100644
--- a/client/src/entry/analysis/App.vue
+++ b/client/src/entry/analysis/App.vue
@@ -1,5 +1,5 @@
 <template>
-    <div id="app">
+    <div id="app" :style="theme">
         <div id="everything">
             <div id="background" />
             <Masthead
@@ -7,8 +7,8 @@
                 id="masthead"
                 :brand="config.brand"
                 :logo-url="config.logo_url"
-                :logo-src="config.logo_src"
-                :logo-src-secondary="config.logo_src_secondary"
+                :logo-src="theme?.['--masthead-logo-img'] ?? config.logo_src"
+                :logo-src-secondary="theme?.['--masthead-logo-img-secondary'] ?? config.logo_src_secondary"
                 :tabs="tabs"
                 :window-tab="windowTab"
                 @open-url="openUrl" />
@@ -36,6 +36,7 @@
         <div id="dd-helper" />
         <Toast ref="toastRef" />
         <ConfirmDialog ref="confirmDialogRef" />
+        <UploadModal ref="uploadModal" />
     </div>
 </template>
 <script>
@@ -46,26 +47,36 @@ import { getAppRoot } from "onload";
 import { HistoryPanelProxy } from "components/History/adapters/HistoryPanelProxy";
 import { fetchMenu } from "entry/analysis/menu";
 import { WindowManager } from "layout/window-manager";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 import Toast from "components/Toast";
 import ConfirmDialog from "components/ConfirmDialog";
+import UploadModal from "components/Upload/UploadModal.vue";
+import { ref } from "vue";
 import { setToastComponentRef } from "composables/toast";
 import { setConfirmDialogComponentRef } from "composables/confirmDialog";
-import { ref } from "vue";
+import { setGlobalUploadModal } from "composables/globalUploadModal";
+import { useCurrentTheme } from "@/composables/user";
 
 export default {
     components: {
         Masthead,
         Toast,
         ConfirmDialog,
+        UploadModal,
     },
     setup() {
         const toastRef = ref(null);
         setToastComponentRef(toastRef);
+
         const confirmDialogRef = ref(null);
         setConfirmDialogComponentRef(confirmDialogRef);
 
-        return { toastRef, confirmDialogRef };
+        const uploadModal = ref(null);
+        setGlobalUploadModal(uploadModal);
+
+        const { currentTheme } = useCurrentTheme();
+
+        return { toastRef, confirmDialogRef, uploadModal, currentTheme };
     },
     data() {
         return {
@@ -86,6 +97,15 @@ export default {
             }
             return true;
         },
+        theme() {
+            const themeKeys = Object.keys(this.config.themes);
+            if (themeKeys.length > 0) {
+                const foundTheme = themeKeys.includes(this.currentTheme);
+                const selectedTheme = foundTheme ? this.currentTheme : themeKeys[0];
+                return this.config.themes[selectedTheme];
+            }
+            return null;
+        },
         windowTab() {
             return this.windowManager.getTab();
         },
@@ -114,7 +134,7 @@ export default {
             if (!urlObj.target) {
                 this.$router.push(urlObj.url);
             } else {
-                const url = safePath(urlObj.url);
+                const url = withPrefix(urlObj.url);
                 if (urlObj.target == "_blank") {
                     window.open(url);
                 } else {
@@ -125,3 +145,7 @@ export default {
     },
 };
 </script>
+
+<style lang="scss">
+@import "custom_theme_variables.scss";
+</style>
diff --git a/client/src/entry/analysis/index.ts b/client/src/entry/analysis/index.ts
index 44c179dac9f..1fec7cfe61c 100644
--- a/client/src/entry/analysis/index.ts
+++ b/client/src/entry/analysis/index.ts
@@ -1,11 +1,10 @@
-import { standardInit, addInitialization } from "onload";
-
 import Vue, { provide } from "vue";
-import App from "./App.vue";
-import store from "store";
-import { getRouter } from "./router";
-import { createPinia, PiniaVuePlugin } from "pinia";
+import { PiniaVuePlugin, createPinia } from "pinia";
 import piniaPluginPersistedstate from "pinia-plugin-persistedstate";
+import App from "./App.vue";
+import { getRouter } from "./router";
+import { addInitialization, standardInit } from "@/onload";
+import store from "@/store";
 
 Vue.use(PiniaVuePlugin);
 const pinia = createPinia();
diff --git a/client/src/entry/analysis/modules/Analysis.vue b/client/src/entry/analysis/modules/Analysis.vue
index 36b1a8af328..4df9c96048d 100644
--- a/client/src/entry/analysis/modules/Analysis.vue
+++ b/client/src/entry/analysis/modules/Analysis.vue
@@ -14,6 +14,7 @@
             </div>
         </div>
         <SidePanel v-if="showPanels" side="right" :current-panel="getHistoryIndex()" :current-panel-properties="{}" />
+        <DragAndDropModal />
     </div>
 </template>
 <script>
@@ -22,11 +23,13 @@ import HistoryIndex from "components/History/Index";
 import ToolBox from "components/Panels/ProviderAwareToolBox";
 import SidePanel from "components/Panels/SidePanel";
 import CenterFrame from "./CenterFrame";
+import DragAndDropModal from "components/Upload/DragAndDropModal";
 
 export default {
     components: {
         CenterFrame,
         SidePanel,
+        DragAndDropModal,
     },
     data() {
         return {
diff --git a/client/src/entry/analysis/modules/CenterFrame.vue b/client/src/entry/analysis/modules/CenterFrame.vue
index 645807acc93..be864e35fae 100644
--- a/client/src/entry/analysis/modules/CenterFrame.vue
+++ b/client/src/entry/analysis/modules/CenterFrame.vue
@@ -11,7 +11,7 @@
         @load="onLoad" />
 </template>
 <script>
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 export default {
     props: {
         id: {
@@ -25,7 +25,7 @@ export default {
     },
     computed: {
         srcWithRoot() {
-            return safePath(this.src);
+            return withPrefix(this.src);
         },
     },
     methods: {
diff --git a/client/src/entry/analysis/modules/Login.test.js b/client/src/entry/analysis/modules/Login.test.js
index 16cab49733a..024a38b80f1 100644
--- a/client/src/entry/analysis/modules/Login.test.js
+++ b/client/src/entry/analysis/modules/Login.test.js
@@ -1,5 +1,5 @@
 import { shallowMount } from "@vue/test-utils";
-import { getLocalVue } from "jest/helpers";
+import { getLocalVue } from "tests/jest/helpers";
 import { getGalaxyInstance } from "app/singleton";
 import MountTarget from "./Login";
 
diff --git a/client/src/entry/analysis/router-push.js b/client/src/entry/analysis/router-push.js
index e4f6b201483..dbdd15cdbbb 100644
--- a/client/src/entry/analysis/router-push.js
+++ b/client/src/entry/analysis/router-push.js
@@ -17,8 +17,6 @@ export function patchRouterPush(VueRouter) {
         if (force) {
             location = addSearchParams(location, { __vkey__: Date.now() });
         }
-        // log upcoming location
-        console.debug("VueRouter - push: ", location);
         // verify if confirmation is required
         if (this.confirmation) {
             if (confirm("There are unsaved changes which will be lost.")) {
diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js
index ac842f9d9a7..56e2bdac7e9 100644
--- a/client/src/entry/analysis/router.js
+++ b/client/src/entry/analysis/router.js
@@ -14,6 +14,7 @@ import WorkflowEditorModule from "entry/analysis/modules/WorkflowEditor";
 // routes
 import AdminRoutes from "entry/analysis/routes/admin-routes";
 import LibraryRoutes from "entry/analysis/routes/library-routes";
+import StorageDashboardRoutes from "entry/analysis/routes/storageDashboardRoutes";
 
 // child components
 import Citations from "components/Citation/Citations";
@@ -62,7 +63,7 @@ import { APIKey } from "components/User/APIKey";
 import { CloudAuth } from "components/User/CloudAuth";
 import { ExternalIdentities } from "components/User/ExternalIdentities";
 import { HistoryExport } from "components/HistoryExport/index";
-import { StorageDashboardRouter } from "components/User/DiskUsage";
+import HistoryExportTasks from "components/History/Export/HistoryExport";
 
 Vue.use(VueRouter);
 
@@ -85,6 +86,7 @@ export function getRouter(Galaxy) {
         routes: [
             ...AdminRoutes,
             ...LibraryRoutes,
+            ...StorageDashboardRoutes,
             /** Login entry route */
             { path: "/login/start", component: Login },
             /** Page editor */
@@ -235,7 +237,9 @@ export function getRouter(Galaxy) {
                     },
                     {
                         path: "histories/:historyId/export",
-                        component: HistoryExport,
+                        get component() {
+                            return Galaxy.config.enable_celery_tasks ? HistoryExportTasks : HistoryExport;
+                        },
                         props: true,
                     },
                     {
@@ -303,11 +307,6 @@ export function getRouter(Galaxy) {
                             plural: "Pages",
                         }),
                     },
-                    {
-                        path: "storage",
-                        component: StorageDashboardRouter,
-                        redirect: redirectAnon(),
-                    },
                     {
                         path: "tours",
                         component: TourList,
@@ -444,6 +443,10 @@ export function getRouter(Galaxy) {
                         path: "workflows/list",
                         component: WorkflowList,
                         redirect: redirectAnon(),
+                        props: (route) => ({
+                            importMessage: route.query["message"],
+                            importStatus: route.query["status"],
+                        }),
                     },
                     {
                         path: "workflows/run",
@@ -469,6 +472,7 @@ export function getRouter(Galaxy) {
                             queryTrsServer: route.query.trs_server,
                             queryTrsId: route.query.trs_id,
                             queryTrsVersionId: route.query.trs_version,
+                            queryTrsUrl: route.query.trs_url,
                             isRun: route.query.run_form == "true",
                         }),
                     },
diff --git a/client/src/entry/analysis/routes/storageDashboardRoutes.ts b/client/src/entry/analysis/routes/storageDashboardRoutes.ts
new file mode 100644
index 00000000000..0e239a5ecbe
--- /dev/null
+++ b/client/src/entry/analysis/routes/storageDashboardRoutes.ts
@@ -0,0 +1,27 @@
+import StorageManager from "@/components/User/DiskUsage/Management/StorageManager.vue";
+import StorageDashboard from "@/components/User/DiskUsage/StorageDashboard.vue";
+import Base from "@/entry/analysis/modules/Base.vue";
+
+export default [
+    {
+        path: "/storage",
+        component: Base,
+        children: [
+            {
+                path: "",
+                name: "StorageDashboard",
+                component: StorageDashboard,
+            },
+            {
+                path: "management",
+                name: "StorageManager",
+                component: StorageManager,
+                props: true,
+            },
+            {
+                path: "*",
+                redirect: { name: "StorageDashboard" },
+            },
+        ],
+    },
+];
diff --git a/client/src/layout/window-manager.js b/client/src/layout/window-manager.js
index 56fed384a5f..28f469e1fdb 100644
--- a/client/src/layout/window-manager.js
+++ b/client/src/layout/window-manager.js
@@ -2,7 +2,7 @@
 import _l from "utils/localization";
 import WinBox from "winbox/src/js/winbox.js";
 import "winbox/dist/css/winbox.min.css";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 
 export class WindowManager {
     constructor(options) {
@@ -26,7 +26,7 @@ export class WindowManager {
 
     /** Add and display a new window based on options. */
     add(options) {
-        const url = safePath(options.url);
+        const url = withPrefix(options.url);
         this.counter++;
         const boxUrl = this._build_url(url, { hide_panels: true, hide_masthead: true });
         WinBox.new({
diff --git a/client/src/mvc/dataset/data.js b/client/src/mvc/dataset/data.js
index 28af32d7e2b..2705f3a6960 100644
--- a/client/src/mvc/dataset/data.js
+++ b/client/src/mvc/dataset/data.js
@@ -1,12 +1,10 @@
 import _ from "underscore";
-import $ from "jquery";
 import Backbone from "backbone";
-import { parse } from "csv-parse/sync";
-
 import { getAppRoot } from "onload/loadConfig";
-import _l from "utils/localization";
-import mod_icon_btn from "mvc/ui/icon-button";
-import { getGalaxyInstance } from "app";
+
+//temporary
+import { appendVueComponent } from "utils/mountVueComponent";
+import TabularChunkedView from "components/Visualizations/Tabular/TabularChunkedView.vue";
 
 /**
  * Dataset metedata.
@@ -68,575 +66,11 @@ export var Dataset = Backbone.Model.extend({
     urlRoot: `${getAppRoot()}api/datasets`,
 });
 
-/**
- * A tabular dataset. This object extends dataset to provide incremental chunked data.
- */
-export var TabularDataset = Dataset.extend({
-    defaults: _.extend({}, Dataset.prototype.defaults, {
-        chunk_url: null,
-        first_data_chunk: null,
-        offset: 0,
-        at_eof: false,
-    }),
-
-    initialize: function (options) {
-        Dataset.prototype.initialize.call(this);
-
-        // If first data chunk is available, next chunk is 1.
-        if (this.attributes.first_data_chunk) {
-            this.attributes.offset = this.attributes.first_data_chunk.offset;
-        }
-        this.attributes.chunk_url = `${getAppRoot()}dataset/display?dataset_id=${this.id}`;
-        this.attributes.url_viz = `${getAppRoot()}visualization`;
-    },
-
-    /**
-     * Returns a jQuery Deferred object that resolves to the next data chunk or null if at EOF.
-     */
-    get_next_chunk: function () {
-        // If already at end of file, do nothing.
-        if (this.attributes.at_eof) {
-            return null;
-        }
-
-        // Get next chunk.
-        var self = this;
-
-        var next_chunk = $.Deferred();
-        $.getJSON(this.attributes.chunk_url, {
-            offset: self.attributes.offset,
-        }).success((chunk) => {
-            var rval;
-            if (chunk.ck_data !== "") {
-                // Found chunk.
-                rval = chunk;
-                self.attributes.offset = chunk.offset;
-            } else {
-                // At EOF.
-                self.attributes.at_eof = true;
-                rval = null;
-            }
-            next_chunk.resolve(rval);
-        });
-
-        return next_chunk;
-    },
-});
-
 export var DatasetCollection = Backbone.Collection.extend({
     model: Dataset,
 });
 
-/**
- * Provides a base for table-based, dynamic view of a tabular dataset.
- * Do not instantiate directly; use either TopLevelTabularDatasetChunkedView
- * or EmbeddedTabularDatasetChunkedView.
- */
-var TabularDatasetChunkedView = Backbone.View.extend({
-    /**
-     * Initialize view and, importantly, set a scroll element.
-     */
-    initialize: function (options) {
-        // Row count for rendering.
-        this.row_count = 0;
-        // Flag for active loading
-        this.loading_chunk = false;
-        // Configure delimiter for parsing data
-        this.delimiter = this.model?.attributes?.file_ext === "csv" ? "," : "\t";
-        this.parseArgs = {
-            delimiter: this.delimiter,
-        };
-        // load trackster button
-        new TabularButtonTracksterView({
-            model: options.model,
-            $el: this.$el,
-        });
-    },
-
-    expand_to_container: function () {
-        if (this.$el.height() < this.scroll_elt.height()) {
-            this.attempt_to_fetch();
-        }
-    },
-
-    attempt_to_fetch: function (func) {
-        var self = this;
-        if (!this.loading_chunk && this.scrolled_to_bottom()) {
-            this.loading_chunk = true;
-            this.loading_indicator.show();
-            $.when(self.model.get_next_chunk()).then((result) => {
-                if (result) {
-                    self._renderChunk(result);
-                    self.loading_chunk = false;
-                }
-                self.loading_indicator.hide();
-                self.expand_to_container();
-            });
-        }
-    },
-
-    render: function () {
-        // Add loading indicator.
-        this.loading_indicator = $("<div/>").attr("id", "loading_indicator");
-        this.$el.append(this.loading_indicator);
-
-        // Add data table and header.
-        var data_table = $("<table/>").attr({
-            id: "content_table",
-            cellpadding: 0,
-        });
-        this.$el.append(data_table);
-        var column_names = this.model.get_metadata("column_names");
-        var header_container = $("<thead/>").appendTo(data_table);
-        var header_row = $("<tr/>").appendTo(header_container);
-        if (column_names?.length > 0) {
-            header_row.append(`<th>${column_names.join("</th><th>")}</th>`);
-        } else {
-            for (var j = 1; j <= this.model.get_metadata("columns"); j++) {
-                header_row.append(`<th>Column ${j}</th>`);
-            }
-        }
-
-        // Render first chunk.
-        var self = this;
-
-        var first_chunk = this.model.get("first_data_chunk");
-        if (first_chunk) {
-            // First chunk is bootstrapped, so render now.
-            this._renderChunk(first_chunk);
-        } else {
-            // No bootstrapping, so get first chunk and then render.
-            $.when(self.model.get_next_chunk()).then((result) => {
-                self._renderChunk(result);
-            });
-        }
-
-        // -- Show new chunks during scrolling. --
-
-        // Set up chunk loading when scrolling using the scrolling element.
-        this.scroll_elt.scroll(() => {
-            self.attempt_to_fetch();
-        });
-    },
-
-    /**
-     * Returns true if user has scrolled to the bottom of the view.
-     */
-    scrolled_to_bottom: function () {
-        return false;
-    },
-
-    // -- Helper functions. --
-
-    _renderCell: function (cell_contents, index, colspan) {
-        var $cell = $("<td>").text(cell_contents);
-        var column_types = this.model.get_metadata("column_types");
-        if (colspan !== undefined) {
-            $cell.attr("colspan", colspan).addClass("stringalign");
-        } else if (column_types) {
-            if (index < column_types.length) {
-                if (column_types[index] === "str" || column_types[index] === "list") {
-                    /* Left align all str columns, right align the rest */
-                    $cell.addClass("stringalign");
-                }
-            }
-        }
-        return $cell;
-    },
-
-    _renderRow: function (rowData) {
-        var row = $("<tr>");
-        var num_columns = this.model.get_metadata("columns");
-        if (this.row_count % 2 !== 0) {
-            row.addClass("dark_row");
-        }
-
-        if (rowData.length === num_columns) {
-            _.each(
-                rowData,
-                function (cell_contents, index) {
-                    row.append(this._renderCell(cell_contents, index));
-                },
-                this
-            );
-        } else if (rowData.length > num_columns) {
-            // SAM file or like format with optional metadata included.
-            _.each(
-                rowData.slice(0, num_columns - 1),
-                function (cell_contents, index) {
-                    row.append(this._renderCell(cell_contents, index));
-                },
-                this
-            );
-            row.append(this._renderCell(rowData.slice(num_columns - 1).join("\t"), num_columns - 1));
-        } else if (rowData.length === 1) {
-            // Try to split by comma first
-            let rowDataSplit = rowData[0].split(",");
-            if (rowDataSplit.length === num_columns) {
-                _.each(
-                    rowDataSplit,
-                    function (cell_contents, index) {
-                        row.append(this._renderCell(cell_contents, index));
-                    },
-                    this
-                );
-            } else {
-                rowDataSplit = rowData[0].split(" ");
-                if (rowDataSplit.length === num_columns) {
-                    _.each(
-                        rowDataSplit,
-                        function (cell_contents, index) {
-                            row.append(this._renderCell(cell_contents, index));
-                        },
-                        this
-                    );
-                } else {
-                    // Comment line, just return the one cell.
-                    row.append(this._renderCell(rowData[0], 0, num_columns));
-                }
-            }
-        } else {
-            // rowData.length is greater than one, but less than num_columns.  Render cells and pad tds.
-            // Possibly a SAM file or like format with optional metadata missing.
-            // Could also be a tabular file with a line with missing columns.
-            _.each(
-                rowData,
-                function (cell_contents, index) {
-                    row.append(this._renderCell(cell_contents, index));
-                },
-                this
-            );
-            _.each(_.range(num_columns - rowData.length), () => {
-                row.append($("<td>"));
-            });
-        }
-
-        this.row_count++;
-        return row;
-    },
-
-    _renderChunk: function (chunk) {
-        var data_table = this.$el.find("table");
-        let parsedChunk = [];
-        try {
-            parsedChunk = parse(chunk.ck_data, this.parseArgs);
-        } catch (error) {
-            // If this blows up it's likely data in a comment or header line
-            // (e.g. VCF files) so just split it by newline first then parse
-            // each line individually.
-            parsedChunk = chunk.ck_data.trim().split("\n");
-            parsedChunk = parsedChunk.map((line) => {
-                try {
-                    return parse(line, this.parseArgs)[0];
-                } catch (error) {
-                    // Failing lines get passed through intact for row-level
-                    // rendering/parsing.
-                    return [line];
-                }
-            });
-        }
-        _.each(
-            parsedChunk,
-            (rowData, index) => {
-                if (index >= (chunk.data_line_offset || 0)) {
-                    data_table.append(this._renderRow(rowData));
-                }
-            },
-            this
-        );
-    },
-});
-
-/**
- * Tabular view that is placed at the top level of page. Scrolling occurs
- * view top-level elements outside of view.
- */
-var TopLevelTabularDatasetChunkedView = TabularDatasetChunkedView.extend({
-    initialize: function (options) {
-        TabularDatasetChunkedView.prototype.initialize.call(this, options);
-
-        // Scrolling happens in top-level elements.
-        var scroll_elt = _.find(this.$el.parents(), (p) => $(p).css("overflow") === "auto");
-
-        // If no scrolling element found, use window.
-        if (!scroll_elt) {
-            scroll_elt = window;
-        }
-
-        // Wrap scrolling element for easy access.
-        this.scroll_elt = $(scroll_elt);
-    },
-
-    /**
-     * Returns true if user has scrolled to the bottom of the view.
-     */
-    scrolled_to_bottom: function () {
-        return this.$el.height() - this.scroll_elt.scrollTop() - this.scroll_elt.height() <= 0;
-    },
-});
-
-/**
- * Tabular view tnat is embedded in a page. Scrolling occurs in view's el.
- */
-var EmbeddedTabularDatasetChunkedView = TabularDatasetChunkedView.extend({
-    initialize: function (options) {
-        TabularDatasetChunkedView.prototype.initialize.call(this, options);
-
-        // Because view is embedded, set up div to do scrolling.
-        this.scroll_elt = this.$el.css({
-            position: "relative",
-            overflow: "scroll",
-            height: options.height || "500px",
-        });
-    },
-
-    /**
-     * Returns true if user has scrolled to the bottom of the view.
-     */
-    scrolled_to_bottom: function () {
-        return this.$el.scrollTop() + this.$el.innerHeight() >= this.el.scrollHeight;
-    },
-});
-
-function search(str, array) {
-    for (var j = 0; j < array.length; j++) {
-        if (array[j].match(str)) {
-            return j;
-        }
-    }
-    return -1;
-}
-
-/** Button for trackster visualization */
-var TabularButtonTracksterView = Backbone.View.extend({
-    // gene region columns
-    col: {
-        chrom: null,
-        start: null,
-        end: null,
-    },
-
-    // url for trackster
-    url_viz: null,
-
-    // dataset id
-    dataset_id: null,
-
-    // database key
-    genome_build: null,
-
-    // data type
-    file_ext: null,
-
-    // backbone initialize
-    initialize: function (options) {
-        // check if environment is available
-        const Galaxy = getGalaxyInstance();
-
-        // link galaxy modal or create one
-        if (Galaxy && Galaxy.modal) {
-            this.modal = Galaxy.modal;
-        }
-
-        // link galaxy frames
-        if (Galaxy && Galaxy.frame) {
-            this.frame = Galaxy.frame;
-        }
-
-        // check
-        if (!this.modal || !this.frame) {
-            return;
-        }
-
-        // model/metadata
-        var model = options.model;
-        var metadata = model.get("metadata");
-
-        // check for datatype
-        if (!model.get("file_ext")) {
-            return;
-        }
-
-        // get data type
-        this.file_ext = model.get("file_ext");
-
-        // check for bed-file format
-        if (this.file_ext == "bed") {
-            // verify that metadata exists
-            if (metadata.get("chromCol") && metadata.get("startCol") && metadata.get("endCol")) {
-                // read in columns
-                this.col.chrom = metadata.get("chromCol") - 1;
-                this.col.start = metadata.get("startCol") - 1;
-                this.col.end = metadata.get("endCol") - 1;
-            } else {
-                console.log("TabularButtonTrackster : Bed-file metadata incomplete.");
-                return;
-            }
-        }
-
-        // check for vcf-file format
-        if (this.file_ext == "vcf") {
-            // search array
-
-            // load
-            this.col.chrom = search("Chrom", metadata.get("column_names"));
-            this.col.start = search("Pos", metadata.get("column_names"));
-            this.col.end = null;
-
-            // verify that metadata exists
-            if (this.col.chrom == -1 || this.col.start == -1) {
-                console.log("TabularButtonTrackster : VCF-file metadata incomplete.");
-                return;
-            }
-        }
-
-        // check
-        if (this.col.chrom === undefined) {
-            return;
-        }
-
-        // get dataset id
-        if (model.id) {
-            this.dataset_id = model.id;
-        } else {
-            console.log("TabularButtonTrackster : Dataset identification is missing.");
-            return;
-        }
-
-        // get url
-        if (model.get("url_viz")) {
-            this.url_viz = model.get("url_viz");
-        } else {
-            console.log("TabularButtonTrackster : Url for visualization controller is missing.");
-            return;
-        }
-
-        // get genome_build / database key
-        if (model.get("genome_build")) {
-            this.genome_build = model.get("genome_build");
-        }
-
-        // create the icon
-        var btn_viz = new mod_icon_btn.IconButtonView({
-            model: new mod_icon_btn.IconButton({
-                title: _l("Visualize"),
-                icon_class: "chart_curve",
-                id: "btn_viz",
-            }),
-        });
-
-        // set element
-        this.setElement(options.$el);
-
-        // add to element
-        this.$el.append(btn_viz.render().$el);
-
-        // hide the button
-        this.hide();
-    },
-
-    /** Add event handlers */
-    events: {
-        "mouseover tr": "show",
-        mouseleave: "hide",
-    },
-
-    // show button
-    show: function (e) {
-        var self = this;
-
-        // is numeric
-        function is_numeric(n) {
-            return !isNaN(parseFloat(n)) && isFinite(n);
-        }
-
-        // check
-        if (this.col.chrom === null) {
-            return;
-        }
-
-        // get selected data line
-        var row = $(e.target).parent();
-
-        // verify that location has been found
-        var chrom = row.children().eq(this.col.chrom).html();
-        var start = row.children().eq(this.col.start).html();
-
-        // end is optional
-        var end = this.col.end ? row.children().eq(this.col.end).html() : start;
-
-        // double check location
-        if (!chrom.match("^#") && chrom !== "" && is_numeric(start)) {
-            // get target gene region
-            var btn_viz_pars = {
-                dataset_id: this.dataset_id,
-                gene_region: `${chrom}:${start}-${end}`,
-            };
-
-            // get button position
-            var offset = row.offset();
-            var left = offset.left - 10;
-            var top = offset.top - $(window).scrollTop() + 3;
-
-            // update css
-            $("#btn_viz").css({
-                position: "fixed",
-                top: `${top}px`,
-                left: `${left}px`,
-            });
-            $("#btn_viz").off("click");
-            $("#btn_viz").click(() => {
-                self.frame.add({
-                    title: _l("Trackster"),
-                    url: `${self.url_viz}/trackster?${$.param(btn_viz_pars)}`,
-                });
-            });
-
-            // show the button
-            $("#btn_viz").show();
-        } else {
-            // hide the button
-            $("#btn_viz").hide();
-        }
-    },
-
-    /** hide button */
-    hide: function () {
-        this.$("#btn_viz").hide();
-    },
-});
-
-/**
- * Create a tabular dataset chunked view (and requisite tabular dataset model)
- * and appends to parent_elt.
- */
-export var createTabularDatasetChunkedView = (options) => {
-    // If no model, create and set model from dataset config.
-    if (!options.model) {
-        options.model = new TabularDataset(options.dataset_config);
-    }
-
-    var parent_elt = options.parent_elt;
-    var embedded = options.embedded;
-
-    // Clean up options so that only needed options are passed to view.
-    delete options.embedded;
-    delete options.parent_elt;
-    delete options.dataset_config;
-
-    // Create and set up view.
-    var view = embedded
-        ? new EmbeddedTabularDatasetChunkedView(options)
-        : new TopLevelTabularDatasetChunkedView(options);
-    view.render();
-
-    if (parent_elt) {
-        parent_elt.append(view.el);
-        // If we're sticking this in another element, once it's appended check
-        // to make sure we've filled enough space.
-        // Without this, the scroll elements don't work.
-        view.expand_to_container();
-    }
-
-    return view;
+export const createTabularDatasetChunkedView = (options) => {
+    // We'll always have a parent_elt in options, so create a div and insert it into that.
+    return appendVueComponent(options.parent_elt, TabularChunkedView, { options });
 };
diff --git a/client/src/mvc/ui/ui-misc.js b/client/src/mvc/ui/ui-misc.js
index e4e0f460964..567d0a9ebda 100644
--- a/client/src/mvc/ui/ui-misc.js
+++ b/client/src/mvc/ui/ui-misc.js
@@ -190,6 +190,11 @@ export var TextSelect = Backbone.View.extend({
         this.setElement($("<div/>").append(this.select.$el).append(this.text.$el));
         this.update(options);
     },
+    remove: function () {
+        this.select.remove();
+        this.text.remove();
+        Backbone.View.prototype.remove.call(this);
+    },
     wait: function () {
         this.select.wait();
     },
@@ -247,12 +252,14 @@ export var Upload = Backbone.View.extend({
         return this;
     },
     _readFile: function (e) {
-        var self = this;
         var file = e.target.files && e.target.files[0];
         if (file) {
             var reader = new FileReader();
-            reader.onload = function () {
-                self.model.set({ wait: false, value: this.result });
+            reader.onload = () => {
+                this.model.set({ wait: false, value: reader.result });
+                if (this.model.get("onchange")) {
+                    this.model.get("onchange")(this.value());
+                }
             };
             this.model.set({ wait: true, value: null });
             reader.readAsText(file);
diff --git a/client/src/mvc/ui/ui-rules-edit.js b/client/src/mvc/ui/ui-rules-edit.js
deleted file mode 100644
index 85f73a3ae46..00000000000
--- a/client/src/mvc/ui/ui-rules-edit.js
+++ /dev/null
@@ -1,141 +0,0 @@
-import Backbone from "backbone";
-import { getAppRoot } from "onload/loadConfig";
-import axios from "axios";
-import _l from "utils/localization";
-import Ui from "mvc/ui/ui-misc";
-import Vue from "vue";
-import RuleBasedCollectionCreatorModal from "components/Collections/RuleBasedCollectionCreatorModal";
-import { RulesDisplay } from "components/RulesDisplay";
-
-/**
- * Bridge rule based builder and the tool form.
- */
-var View = Backbone.View.extend({
-    initialize: function (options) {
-        this.model = new Backbone.Model();
-        this.target = options.target;
-        const view = this;
-
-        // create insert edit button
-        this.browse_button = new Ui.Button({
-            title: _l("Edit"),
-            icon: "fa fa-edit",
-            tooltip: _l("Edit Rules"),
-            onclick: () => {
-                if (view.target) {
-                    view._fetchCollectionAndEdit();
-                } else {
-                    view._showRuleEditor(null);
-                }
-            },
-        });
-
-        // add change event. fires on trigger
-        this.on("change", () => {
-            if (options.onchange) {
-                options.onchange(this.value());
-            }
-        });
-
-        // create elements
-        this.setElement(this._template(options));
-        this.$(".ui-rules-edit-button").append(this.browse_button.$el);
-        var rulesDisplayInstance = Vue.extend(RulesDisplay);
-        var vm = document.createElement("div");
-        this.$(".ui-rules-preview").append(vm);
-        this.instance = new rulesDisplayInstance({
-            propsData: {
-                initialRules: {
-                    rules: [],
-                    mapping: [],
-                },
-            },
-        });
-        this.instance.$mount(vm);
-    },
-
-    _fetchCollectionAndEdit: function () {
-        const view = this;
-        const url = `${getAppRoot()}api/dataset_collections/${view.target.id}?instance_type=history`;
-        axios
-            .get(url)
-            .then((response) => this._showCollection(response))
-            .catch(view._renderFetchError);
-    },
-
-    _showCollection: function (response) {
-        const elements = response.data;
-        this._showRuleEditor(elements);
-    },
-
-    _showRuleEditor: function (elements) {
-        const elementsType = "collection_contents";
-        const importType = "collections";
-        const value = this._value;
-        const options = {
-            saveRulesFn: (rules) => this._handleRulesSave(rules),
-            initialRules: value,
-        };
-        RuleBasedCollectionCreatorModal.ruleBasedCollectionCreatorModal(
-            elements,
-            elementsType,
-            importType,
-            options
-        ).catch(() => {});
-    },
-
-    _handleRulesSave: function (rules) {
-        this._setValue(rules);
-    },
-
-    _renderFetchError: function (e) {
-        console.log(e);
-        console.log("problem fetching collection");
-    },
-
-    /** Main Template */
-    _template: function (options) {
-        return `
-            <div class="ui-rules-edit clearfix">
-                <span class="ui-rules-preview" />
-                <span class="ui-rules-edit-button float-left" />
-            </div>
-        `;
-    },
-
-    /** Return/Set current value */
-    value: function (new_value) {
-        if (new_value !== undefined) {
-            this._setValue(new_value);
-        } else {
-            return this._getValue();
-        }
-    },
-
-    /** Update input element options */
-    update: function (input_def) {
-        this.target = input_def.target;
-    },
-
-    /** Returns current value */
-    _getValue: function () {
-        return this._value;
-    },
-
-    /** Sets current value */
-    _setValue: function (new_value) {
-        if (new_value) {
-            if (typeof new_value == "string") {
-                new_value = JSON.parse(new_value);
-            }
-            this._value = new_value;
-            this.model.trigger("error", null);
-            this.trigger("change");
-            this.instance.inputRules = new_value;
-        }
-    },
-});
-
-export default {
-    View: View,
-};
diff --git a/client/src/mvc/ui/ui-select-default.js b/client/src/mvc/ui/ui-select-default.js
index f30a8d49c5c..ab7a5ea6809 100644
--- a/client/src/mvc/ui/ui-select-default.js
+++ b/client/src/mvc/ui/ui-select-default.js
@@ -44,6 +44,11 @@ var View = Backbone.View.extend({
         this.render();
     },
 
+    remove: function () {
+        this.$select.select2("destroy");
+        Backbone.View.prototype.remove.call(this);
+    },
+
     render: function () {
         if (this.model.get("searchable")) {
             this._renderSearchable();
diff --git a/client/src/mvc/visualization/chart/chart-client.js b/client/src/mvc/visualization/chart/chart-client.js
index 7c9d4dcb0c4..3b94a33dda4 100644
--- a/client/src/mvc/visualization/chart/chart-client.js
+++ b/client/src/mvc/visualization/chart/chart-client.js
@@ -31,8 +31,12 @@ export default Backbone.View.extend({
         this.$buttons = this.$(".charts-buttons");
         this.chart = new Chart({}, options);
         this.chart.plugin = options.visualization_plugin;
-        this.chart.requiresConfirmation = asBoolean(this.chart.plugin.specs.confirm);
         this.chart.plugin.specs = this.chart.plugin.specs || {};
+        if (Object.keys(this.chart.plugin.specs).length === 0) {
+            this.chart.requiresConfirmation = false;
+        } else {
+            this.chart.requiresConfirmation = asBoolean(this.chart.plugin.specs.confirm);
+        }
         this.chart_load = options.chart_load;
         this.message = new Ui.Message();
         this.deferred = new Deferred();
diff --git a/client/src/nls/es/locale.js b/client/src/nls/es/locale.js
index 2da775f856f..1909f9dfa87 100644
--- a/client/src/nls/es/locale.js
+++ b/client/src/nls/es/locale.js
@@ -55,7 +55,14 @@ define({
     Register: "Registro",
 
     "Login or Register": "Iniciar sesión o Registrarse",
-
+    "Subscribe to mailing list": false,
+    "Already have an account?": false,
+    "Log in here.": false,
+    "Create a Galaxy account": false,
+    "Or, register with email": false,
+    "Forgot password?": false,
+    "Register here.": false,
+    "Click here to reset your password.": false,
     "Logged in as": "Se ha conectado como",
 
     Preferences: "Preferencias",
@@ -501,7 +508,7 @@ define({
     Groups: "Grupos",
     "API keys": "Llaves API",
     "Impersonate a user": "Acceder como otro usuario",
-    Data: false,
+    Data: "Datos",
     Quotas: false,
     Roles: false,
     "Local data": "Datos locales",
@@ -522,7 +529,7 @@ define({
     "Any additional comments you can provide regarding what you were doing at the time of the bug.":
         "Cualquier comentario adicional que puedas proporcionar sobre lo que estabas haciendo en el momento que se produjo el error.",
     "Your email address": "Tu dirección de correo electrónico",
-    Report: false,
+    Report: "Reporte",
     "Error Report": "Reporte de error",
     // ---------------------------------------------------------------------------- dataset-li
     "Dataset details": "Detalles del conjunto de datos",
@@ -538,11 +545,6 @@ define({
     "Change datatype": "Cambiar tipo de datos",
     "Convert datatype": "Convertir tipo de datos",
     "Convert to new format": "Convertir a formato nuevo",
-    Save: false,
-    Permissions: false,
-    Datatypes: false,
-    Convert: false,
-    Attributes: false,
 
     "This will change the datatype of the existing dataset but not modify its contents. Use this if Galaxy has incorrectly guessed the type of your dataset.":
         "Esto cambiará el tipo de datos del conjunto de datos existente pero no modificará su contenido. Utilícelo si Galaxy identificó incorrectamente el tipo de su conjunto de datos",
@@ -627,8 +629,8 @@ define({
     "If you change your email address you will receive an activation link in the new mailbox and you have to activate your account by visiting it.":
         "Si cambias tu dirección de correo electrónico recibirás un vínculo de activación en tu nuevo correo. Debes activar tu cuenta recurriendo a esta notificación.",
     "Public name": "Nombre público",
-    'Your public name is an identifier that will be used to generate addresses for information you share publicly. Public names must be at least three characters in length and contain only lower-case letters, numbers, and the "-" character.':
-        'Tu nombre público es un identificador que será utilizado para generar direcciones de información que compartas al público. Los nombres públicos deben contener al menos tres caracteres de longitud, solo letras minúsculas, números o el símbolo "-". ',
+    "Your public name is an identifier that will be used to generate addresses for information you share publicly. Public names must be at least three characters in length and contain only lower-case letters, numbers, dots, underscores, and dashes ('.', '_', '-').":
+        "Tu nombre público es un identificador que será utilizado para generar direcciones de información que compartas al público. Los nombres públicos deben contener al menos tres caracteres de longitud, solo letras minúsculas, números o el símbolo '-'. ",
     Address: "Dirección",
     "Insert address": "Escribir dirección",
     "Do you want to be able to re-use equivalent jobs ?": "¿Deseas poder reutilizar trabajos equivalentes?",
@@ -645,20 +647,15 @@ define({
     "Your EGA (European Genome Archive) Account": "Tu cuenta EGA (European Genome Archive)",
     Username: "Nombre de usuario",
     Password: "Contraseña",
+    "Confirm password": "Confirmar contraseña",
     "Your Dropbox Account": "Tu cuenta Dropbox",
     "Dropbox access token": "Token de acceso de Dropbox",
     "Your B2DROP Account": "Tu cuenta B2DROP",
-    Username: "Nombre de usuario",
-    Password: "Contraseña",
     "Your OMERO instance connection details": "Detalles de conección de tu instancia OMERO",
-    Username: "Nombre de usuario",
-    Password: "Contraseña",
     "Your ENA Webin account details": "Detalles de tu cuenta Webin de ENA",
     "ENA Webin ID": "Identificador Webin de ENA",
-    Password: "Contraseña",
     "Your CDS API Key": "Tu llave CDS API",
     Key: "Llave",
-    Save: "Guardar",
 
     //X GB  Tu cuota de disco es: X GB.
     //
@@ -768,7 +765,7 @@ define({
     "Phyloviz Help": "Ayuda de PhyloViz",
     "Save visualization": "Guardar visualización",
     "PhyloViz Settings": "Ajustes de PhyloViz",
-    Title: false,
+    Title: "Título",
     // ---------------------------------------------------------------------------- filters
     "Filtering Dataset": "Filtrando conjunto de datos",
     "Filter Dataset": "Filtrar conjunto de datos",
@@ -776,7 +773,7 @@ define({
     "Show individual tracks": "Mostrar pistas individuales",
     "Trackster Error": "Error de Trackster",
     "Tool parameter space visualization": "Visualización del espacio de parámetros de la herramienta",
-    Tool: false,
+    Tool: "Herramienta",
     "Set as overview": "Establecer como descripción general",
     "Set display mode": "Establecer modo de visualización",
     Filters: false,
@@ -788,7 +785,7 @@ define({
     "Test Title": "Título de prueba",
     "Test button": "Botón de prueba",
     // ---------------------------------------------------------------------------- ui_tests
-    title: false,
+    title: "título",
     // ---------------------------------------------------------------------------- user-custom-builds
     "Create new Build": "Crear nueva construcción",
     "Delete custom build.": "Eliminar construcción personalizada",
diff --git a/client/src/nls/locale.js b/client/src/nls/locale.js
index 5e0e2e04977..b17d4d5c7d4 100644
--- a/client/src/nls/locale.js
+++ b/client/src/nls/locale.js
@@ -451,6 +451,14 @@ define({
         // ---------------------------------------------------------------------------- workflow_editor_tests
         "tool tooltip": false,
         // ----------------------------------------------------------------------------
+        "Subscribe to mailing list": false,
+        "Already have an account?": false,
+        "Log in here.": false,
+        "Create a Galaxy account": false,
+        "Or, register with email": false,
+        "Forgot password?": false,
+        "Register here.": false,
+        "Click here to reset your password.": false,
     },
     ja: true,
     fr: true,
diff --git a/client/src/onload/getRootFromIndexLink.ts b/client/src/onload/getRootFromIndexLink.ts
index 76d979bc580..7ca6c43c0b9 100644
--- a/client/src/onload/getRootFromIndexLink.ts
+++ b/client/src/onload/getRootFromIndexLink.ts
@@ -1,9 +1,13 @@
-// Finds <link rel="index"> in head element and pulls root url fragment from
-// there That should probably be a <base> tag instead since that's how
-// they're using <link rel="index" />
-
-import { serverPath } from "utils/serverPath";
+import { serverPath } from "@/utils/serverPath";
 
+/**
+ * Finds <link rel="index"> in head element and pulls root url fragment from
+ * there That should probably be a <base> tag instead since that's how
+ * they're using <link rel="index" />
+ *
+ * @param {string} [defaultRoot="/"]
+ * @returns {string}
+ */
 export function getRootFromIndexLink(defaultRoot = "/"): string {
     const links = document.getElementsByTagName("link");
     const indexLink = Array.from(links).find((link) => link.rel == "index");
diff --git a/client/src/reports/run_stats.js b/client/src/reports/run_stats.js
index a0036b9c229..e7d8dc92d9c 100644
--- a/client/src/reports/run_stats.js
+++ b/client/src/reports/run_stats.js
@@ -1,6 +1,5 @@
 import $ from "jquery";
 import * as d3 from "d3";
-import { event as currentEvent } from "d3";
 
 function date_by_subtracting_days(date, days) {
     return new Date(
@@ -126,14 +125,14 @@ export function create_chart(inp_data, name, time, title) {
             }
 
             var wdth = i * 4 + 10;
-            d3.select(currentEvent.target.parentElement)
+            d3.select(d.target.parentElement)
                 .select(".tool_tip")
                 .select("text")
                 .attr("transform", `translate( ${margin.left - 5}, ${height - d * zoom + margin.top + 10} )`)
                 .attr("visibility", "visible")
                 .text(d);
 
-            d3.select(currentEvent.target.parentElement)
+            d3.select(d.target.parentElement)
                 .select(".tool_tip")
                 .attr("width", `${wdth}px`)
                 .attr("height", "15px")
@@ -145,12 +144,9 @@ export function create_chart(inp_data, name, time, title) {
         })
         .on("mouseleave", (d) => {
             // Remove tool tip
-            d3.select(currentEvent.target.parentElement)
-                .select(".tool_tip")
-                .select("text")
-                .attr("visibility", "hidden");
+            d3.select(d.target.parentElement).select(".tool_tip").select("text").attr("visibility", "hidden");
 
-            d3.select(currentEvent.target.parentElement)
+            d3.select(d.target.parentElement)
                 .select(".tool_tip")
                 .select("rect")
                 .attr("width", "0")
@@ -182,14 +178,14 @@ export function create_chart(inp_data, name, time, title) {
         });
 
     // Declare how high the y axis goes
-    var y = d3.scale.linear().range([height, 0]);
+    var y = d3.curveLinear().range([height, 0]);
 
     // Create a yAxis object
     var yAxis = d3.svg
         .axis()
         .scale(y)
         .orient("left")
-        .tickFormat((d) => d3.round(d * d3.max(data), 0));
+        .tickFormat((d) => Math.round(d * d3.max(data), 0));
 
     // Put the y axis on the chart
     chart
@@ -442,13 +438,13 @@ export function create_histogram(inp_data, name, title) {
 
     // Cereate x axis metadata
     // Used for x axis, histogram creation, and bar initialization
-    var x = d3.scale
-        .linear()
+    var x = d3
+        .curveLinear()
         .domain([0, d3.max(data)])
         .range([0, width]);
 
     // Generate a histogram using twenty uniformly-spaced bins.
-    data = d3.layout.histogram().bins(x.ticks(20))(data);
+    data = d3.histogram().bins(x.ticks(20))(data);
 
     // Create an array of the sizes of the bars
     var lengths = [];
@@ -466,8 +462,8 @@ export function create_histogram(inp_data, name, title) {
 
     // Create y axis metadata
     // Used for y axis and bar initialization
-    var y = d3.scale
-        .linear()
+    var y = d3
+        .curveLinear()
         .domain([0, d3.max(data, (d) => d.y)])
         .range([height, 0]);
 
@@ -542,14 +538,14 @@ export function create_histogram(inp_data, name, title) {
                 i++;
             }
             var wdth = i * 4 + 10;
-            d3.select(currentEvent.target.parentElement)
+            d3.select(d.target.parentElement)
                 .select(".tool_tip")
                 .select("text")
                 .attr("transform", `translate( ${margin.left - 5}, ${height - d.length * zoom + margin.top + 10} )`)
                 .attr("visibility", "visible")
                 .text(d.length);
 
-            d3.select(currentEvent.target.parentElement)
+            d3.select(d.target.parentElement)
                 .select(".tool_tip")
                 .attr("width", `${wdth}px`)
                 .attr("height", "15px")
@@ -559,14 +555,11 @@ export function create_histogram(inp_data, name, title) {
                 .attr("height", "15px")
                 .attr("fill", "#ebd9b2");
         })
-        .on("mouseleave", () => {
+        .on("mouseleave", (d) => {
             // Remove tool tip
-            d3.select(currentEvent.target.parentElement)
-                .select(".tool_tip")
-                .select("text")
-                .attr("visibility", "hidden");
+            d3.select(d.target.parentElement).select(".tool_tip").select("text").attr("visibility", "hidden");
 
-            d3.select(currentEvent.target.parentElement)
+            d3.select(d.target.parentElement)
                 .select(".tool_tip")
                 .select("rect")
                 .attr("width", "0")
diff --git a/client/src/schema/fetcher.ts b/client/src/schema/fetcher.ts
index 75f535eb452..d948ed83a38 100644
--- a/client/src/schema/fetcher.ts
+++ b/client/src/schema/fetcher.ts
@@ -1,6 +1,6 @@
 import { Fetcher } from "openapi-typescript-fetch";
-import { getAppRoot } from "onload/loadConfig";
-import { rethrowSimple } from "utils/simple-error";
+import { getAppRoot } from "@/onload/loadConfig";
+import { rethrowSimple } from "@/utils/simple-error";
 import type { paths } from "./schema";
 import type { Middleware } from "openapi-typescript-fetch";
 
diff --git a/client/src/schema/schema.ts b/client/src/schema/schema.ts
index 8aba6eee8da..29886efe1fb 100644
--- a/client/src/schema/schema.ts
+++ b/client/src/schema/schema.ts
@@ -4,6 +4,10 @@
  */
 
 export interface paths {
+    "/api/authenticate/baseauth": {
+        /** Returns returns an API key for authenticated user based on BaseAuth headers. */
+        get: operations["get_api_key_api_authenticate_baseauth_get"];
+    };
     "/api/configuration": {
         /**
          * Return an object containing exposable configuration settings
@@ -228,6 +232,10 @@ export interface paths {
          */
         get: operations["types_and_mapping_api_datatypes_types_and_mapping_get"];
     };
+    "/api/drs_download/{object_id}": {
+        /** Download */
+        get: operations["download_api_drs_download__object_id__get"];
+    };
     "/api/folders/{folder_id}/contents": {
         /**
          * Returns a list of a folder's contents (files and sub-folders) with additional metadata about the folder.
@@ -315,25 +323,20 @@ export interface paths {
         /** Displays a collection (list) of groups. */
         get: operations["index_api_groups__group_id__roles_get"];
     };
-    "/api/groups/{group_id}/roles/{id}": {
-        /** Displays information about a group role. */
-        get: operations["group_role_api_groups__group_id__roles__id__get"];
-    };
     "/api/groups/{group_id}/roles/{role_id}": {
+        /** Displays information about a group role. */
+        get: operations["group_role_api_groups__group_id__roles__role_id__get"];
         /** Adds a role to a group */
         put: operations["update_api_groups__group_id__roles__role_id__put"];
         /** Removes a role from a group */
         delete: operations["delete_api_groups__group_id__roles__role_id__delete"];
     };
-    "/api/groups/{group_id}/user/{id}": {
+    "/api/groups/{group_id}/user/{user_id}": {
         /**
          * Displays information about a group user.
-         * @description GET /api/groups/{encoded_group_id}/users/{encoded_user_id}
-         * Displays information about a group user.
+         * @description Displays information about a group user.
          */
-        get: operations["group_user_api_groups__group_id__user__id__get"];
-    };
-    "/api/groups/{group_id}/user/{user_id}": {
+        get: operations["group_user_api_groups__group_id__user__user_id__get"];
         /**
          * Adds a user to a group
          * @description PUT /api/groups/{encoded_group_id}/users/{encoded_user_id}
@@ -355,15 +358,12 @@ export interface paths {
          */
         get: operations["index_api_groups__group_id__users_get"];
     };
-    "/api/groups/{group_id}/users/{id}": {
+    "/api/groups/{group_id}/users/{user_id}": {
         /**
          * Displays information about a group user.
-         * @description GET /api/groups/{encoded_group_id}/users/{encoded_user_id}
-         * Displays information about a group user.
+         * @description Displays information about a group user.
          */
-        get: operations["group_user_api_groups__group_id__users__id__get"];
-    };
-    "/api/groups/{group_id}/users/{user_id}": {
+        get: operations["group_user_api_groups__group_id__users__user_id__get"];
         /**
          * Adds a user to a group
          * @description PUT /api/groups/{encoded_group_id}/users/{encoded_user_id}
@@ -390,9 +390,9 @@ export interface paths {
         /** Returns deleted histories for the current user. */
         get: operations["index_deleted_api_histories_deleted_get"];
     };
-    "/api/histories/deleted/{id}/undelete": {
+    "/api/histories/deleted/{history_id}/undelete": {
         /** Restores a deleted history with the given ID (that hasn't been purged). */
-        post: operations["undelete_api_histories_deleted__id__undelete_post"];
+        post: operations["undelete_api_histories_deleted__history_id__undelete_post"];
     };
     "/api/histories/from_store": {
         /** Create histories from a model store. */
@@ -414,6 +414,18 @@ export interface paths {
         /** Return all histories that are shared with the current user. */
         get: operations["shared_with_me_api_histories_shared_with_me_get"];
     };
+    "/api/histories/{history_id}": {
+        /** Returns the history with the given ID. */
+        get: operations["history_api_histories__history_id__get"];
+        /** Updates the values for the history with the given ID. */
+        put: operations["update_api_histories__history_id__put"];
+        /** Marks the history with the given ID as deleted. */
+        delete: operations["delete_api_histories__history_id__delete"];
+    };
+    "/api/histories/{history_id}/citations": {
+        /** Return all the citations for the tools used to produce the datasets in the history. */
+        get: operations["citations_api_histories__history_id__citations_get"];
+    };
     "/api/histories/{history_id}/contents": {
         /**
          * Returns the contents of the given history.
@@ -440,6 +452,15 @@ export interface paths {
          */
         post: operations["create_api_histories__history_id__contents_post"];
     };
+    "/api/histories/{history_id}/contents/archive": {
+        /**
+         * Build and return a compressed archive of the selected history contents.
+         * @description Build and return a compressed archive of the selected history contents.
+         *
+         * **Note**: this is a volatile endpoint and settings and behavior may change.
+         */
+        get: operations["archive_api_histories__history_id__contents_archive_get"];
+    };
     "/api/histories/{history_id}/contents/archive/{filename}.{format}": {
         /**
          * Build and return a compressed archive of the selected history contents.
@@ -449,15 +470,6 @@ export interface paths {
          */
         get: operations["archive_api_histories__history_id__contents_archive__filename___format__get"];
     };
-    "/api/histories/{history_id}/contents/archive/{id}": {
-        /**
-         * Build and return a compressed archive of the selected history contents.
-         * @description Build and return a compressed archive of the selected history contents.
-         *
-         * **Note**: this is a volatile endpoint and settings and behavior may change.
-         */
-        get: operations["archive_api_histories__history_id__contents_archive__id__get"];
-    };
     "/api/histories/{history_id}/contents/bulk": {
         /**
          * Executes an operation on a set of items contained in the given History.
@@ -475,15 +487,6 @@ export interface paths {
          */
         get: operations["download_dataset_collection_api_histories__history_id__contents_dataset_collections__id__download_get"];
     };
-    "/api/histories/{history_id}/contents/dataset_collections/{id}/prepare_download": {
-        /**
-         * Prepare an short term storage object that the collection will be downloaded to.
-         * @description The history dataset collection will be written as a `zip` archive to the
-         * returned short term storage object. Progress tracking this file's creation
-         * can be tracked with the short_term_storage API.
-         */
-        post: operations["prepare_collection_download_api_histories__history_id__contents_dataset_collections__id__prepare_download_post"];
-    };
     "/api/histories/{history_id}/contents/datasets/{id}/materialize": {
         /** Materialize a deferred dataset into real, usable dataset. */
         post: operations["materialize_dataset_api_histories__history_id__contents_datasets__id__materialize_post"];
@@ -495,47 +498,6 @@ export interface paths {
          */
         put: operations["update_permissions_api_histories__history_id__contents__dataset_id__permissions_put"];
     };
-    "/api/histories/{history_id}/contents/{direction}/{hid}/{limit}": {
-        /**
-         * Get content items around a particular `HID`.
-         * @description .. warning:: For internal use to support the scroller functionality.
-         *
-         * This endpoint provides random access to a large history without having
-         * to know exactly how many pages are in the final query. Pick a target HID
-         * and filters, and the endpoint will get a maximum of `limit` history items "around" the `hid`.
-         *
-         * Additional counts are provided in the HTTP headers.
-         *
-         * The `direction` determines what items are selected:
-         *
-         * a) item counts:
-         *
-         *    - total matches-up:   hid < {hid}
-         *    - total matches-down: hid > {hid}
-         *    - total matches:      total matches-up + total matches-down + 1 (+1 for hid == {hid})
-         *    - displayed matches-up:   hid <= {hid} (hid == {hid} is included)
-         *    - displayed matches-down: hid > {hid}
-         *    - displayed matches:      displayed matches-up + displayed matches-down
-         *
-         * b) {limit} history items:
-         *
-         *    - if direction == "before": hid <= {hid}
-         *    - if direction == "after":  hid > {hid}
-         *    - if direction == "near":   "near" {hid}, so that
-         *      n. items before <= limit // 2,
-         *      n. items after <= limit // 2 + 1.
-         *
-         * .. note:: This endpoint uses slightly different filter params syntax. Instead of using `q`/`qv` parameters,
-         *     it uses the following syntax for query parameters::
-         *
-         *         ?[field]-[operator]=[value]
-         *
-         *     Example::
-         *
-         *         ?update_time-gt=2015-01-29
-         */
-        get: operations["contents_near_api_histories__history_id__contents__direction___hid___limit__get"];
-    };
     "/api/histories/{history_id}/contents/{history_content_id}/display": {
         /**
          * Displays (preview) or downloads dataset content.
@@ -654,6 +616,63 @@ export interface paths {
          */
         post: operations["create_from_store_api_histories__history_id__contents_from_store_post"];
     };
+    "/api/histories/{history_id}/custom_builds_metadata": {
+        /** Returns meta data for custom builds. */
+        get: operations["get_custom_builds_metadata_api_histories__history_id__custom_builds_metadata_get"];
+    };
+    "/api/histories/{history_id}/disable_link_access": {
+        /**
+         * Makes this item inaccessible by a URL link.
+         * @description Makes this item inaccessible by a URL link and return the current sharing status.
+         */
+        put: operations["disable_link_access_api_histories__history_id__disable_link_access_put"];
+    };
+    "/api/histories/{history_id}/enable_link_access": {
+        /**
+         * Makes this item accessible by a URL link.
+         * @description Makes this item accessible by a URL link and return the current sharing status.
+         */
+        put: operations["enable_link_access_api_histories__history_id__enable_link_access_put"];
+    };
+    "/api/histories/{history_id}/exports": {
+        /**
+         * Get previous history exports.
+         * @description By default the legacy job-based history exports (jeha) are returned.
+         *
+         * Change the `accept` content type header to return the new task-based history exports.
+         */
+        get: operations["get_history_exports_api_histories__history_id__exports_get"];
+        /**
+         * Start job (if needed) to create history export for corresponding history.
+         * @deprecated
+         * @description This will start a job to create a history export archive.
+         *
+         * Calling this endpoint multiple times will return the 202 status code until the archive
+         * has been completely generated and is ready to download. When ready, it will return
+         * the 200 status code along with the download link information.
+         *
+         * If the history will be exported to a `directory_uri`, instead of returning the download
+         * link information, the Job ID will be returned so it can be queried to determine when
+         * the file has been written.
+         *
+         * **Deprecation notice**: Please use `/api/histories/{id}/prepare_store_download` or
+         * `/api/histories/{id}/write_store` instead.
+         */
+        put: operations["archive_export_api_histories__history_id__exports_put"];
+    };
+    "/api/histories/{history_id}/exports/{jeha_id}": {
+        /**
+         * If ready and available, return raw contents of exported history as a downloadable archive.
+         * @deprecated
+         * @description See ``PUT /api/histories/{id}/exports`` to initiate the creation
+         * of the history export - when ready, that route will return 200 status
+         * code (instead of 202) and this route can be used to download the archive.
+         *
+         * **Deprecation notice**: Please use `/api/histories/{id}/prepare_store_download` or
+         * `/api/histories/{id}/write_store` instead.
+         */
+        get: operations["history_archive_download_api_histories__history_id__exports__jeha_id__get"];
+    };
     "/api/histories/{history_id}/jobs_summary": {
         /**
          * Return job state summary info for jobs, implicit groups jobs for collections or workflow invocations.
@@ -670,104 +689,48 @@ export interface paths {
         /** Materialize a deferred library or HDA dataset into real, usable dataset in specified history. */
         post: operations["materialize_to_history_api_histories__history_id__materialize_post"];
     };
-    "/api/histories/{id}": {
-        /** Returns the history with the given ID. */
-        get: operations["history_api_histories__id__get"];
-        /** Updates the values for the history with the given ID. */
-        put: operations["update_api_histories__id__put"];
-        /** Marks the history with the given ID as deleted. */
-        delete: operations["delete_api_histories__id__delete"];
-    };
-    "/api/histories/{id}/citations": {
-        /** Return all the citations for the tools used to produce the datasets in the history. */
-        get: operations["citations_api_histories__id__citations_get"];
-    };
-    "/api/histories/{id}/custom_builds_metadata": {
-        /** Returns meta data for custom builds. */
-        get: operations["get_custom_builds_metadata_api_histories__id__custom_builds_metadata_get"];
-    };
-    "/api/histories/{id}/disable_link_access": {
-        /**
-         * Makes this item inaccessible by a URL link.
-         * @description Makes this item inaccessible by a URL link and return the current sharing status.
-         */
-        put: operations["disable_link_access_api_histories__id__disable_link_access_put"];
-    };
-    "/api/histories/{id}/enable_link_access": {
-        /**
-         * Makes this item accessible by a URL link.
-         * @description Makes this item accessible by a URL link and return the current sharing status.
-         */
-        put: operations["enable_link_access_api_histories__id__enable_link_access_put"];
-    };
-    "/api/histories/{id}/exports": {
-        /** Get previous history exports (to links). Effectively returns serialized JEHA objects. */
-        get: operations["index_exports_api_histories__id__exports_get"];
-        /**
-         * Start job (if needed) to create history export for corresponding history.
-         * @description This will start a job to create a history export archive.
-         *
-         * Calling this endpoint multiple times will return the 202 status code until the archive
-         * has been completely generated and is ready to download. When ready, it will return
-         * the 200 status code along with the download link information.
-         *
-         * If the history will be exported to a `directory_uri`, instead of returning the download
-         * link information, the Job ID will be returned so it can be queried to determine when
-         * the file has been written.
-         */
-        put: operations["archive_export_api_histories__id__exports_put"];
-    };
-    "/api/histories/{id}/exports/{jeha_id}": {
-        /**
-         * If ready and available, return raw contents of exported history as a downloadable archive.
-         * @description See ``PUT /api/histories/{id}/exports`` to initiate the creation
-         * of the history export - when ready, that route will return 200 status
-         * code (instead of 202) and this route can be used to download the archive.
-         */
-        get: operations["history_archive_download_api_histories__id__exports__jeha_id__get"];
-    };
-    "/api/histories/{id}/prepare_store_download": {
+    "/api/histories/{history_id}/prepare_store_download": {
         /** Return a short term storage token to monitor download of the history. */
-        post: operations["prepare_store_download_api_histories__id__prepare_store_download_post"];
+        post: operations["prepare_store_download_api_histories__history_id__prepare_store_download_post"];
     };
-    "/api/histories/{id}/publish": {
+    "/api/histories/{history_id}/publish": {
         /**
          * Makes this item public and accessible by a URL link.
          * @description Makes this item publicly available by a URL link and return the current sharing status.
          */
-        put: operations["publish_api_histories__id__publish_put"];
+        put: operations["publish_api_histories__history_id__publish_put"];
     };
-    "/api/histories/{id}/share_with_users": {
+    "/api/histories/{history_id}/share_with_users": {
         /**
          * Share this item with specific users.
          * @description Shares this item with specific users and return the current sharing status.
          */
-        put: operations["share_with_users_api_histories__id__share_with_users_put"];
+        put: operations["share_with_users_api_histories__history_id__share_with_users_put"];
     };
-    "/api/histories/{id}/sharing": {
+    "/api/histories/{history_id}/sharing": {
         /**
          * Get the current sharing status of the given item.
          * @description Return the sharing status of the item.
          */
-        get: operations["sharing_api_histories__id__sharing_get"];
+        get: operations["sharing_api_histories__history_id__sharing_get"];
     };
-    "/api/histories/{id}/slug": {
+    "/api/histories/{history_id}/slug": {
         /**
          * Set a new slug for this shared item.
          * @description Sets a new slug to access this item by URL. The new slug must be unique.
          */
-        put: operations["set_slug_api_histories__id__slug_put"];
+        put: operations["set_slug_api_histories__history_id__slug_put"];
     };
-    "/api/histories/{id}/unpublish": {
+    "/api/histories/{history_id}/unpublish": {
         /**
          * Removes this item from the published list.
          * @description Removes this item from the published list and return the current sharing status.
          */
-        put: operations["unpublish_api_histories__id__unpublish_put"];
+        put: operations["unpublish_api_histories__history_id__unpublish_put"];
     };
-    "/api/histories/{id}/write_store": {
+    "/api/histories/{history_id}/write_store": {
         /** Prepare history for export-style download and write to supplied URI. */
-        post: operations["write_store_api_histories__id__write_store_post"];
+        post: operations["write_store_api_histories__history_id__write_store_post"];
     };
     "/api/invocations/{invocation_id}/biocompute": {
         /**
@@ -1119,6 +1082,8 @@ export interface paths {
          * @description Get the list of all available data tables.
          */
         get: operations["index_api_tool_data_get"];
+        /** Import a data manager bundle */
+        post: operations["create_api_tool_data_post"];
     };
     "/api/tool_data/{table_name}": {
         /**
@@ -1274,6 +1239,10 @@ export interface paths {
          */
         get: operations["index_api_workflows_get"];
     };
+    "/api/workflows/menu": {
+        /** Get workflows present in the tools panel. */
+        get: operations["get_workflow_menu_api_workflows_menu_get"];
+    };
     "/api/workflows/{id}/disable_link_access": {
         /**
          * Makes this item inaccessible by a URL link.
@@ -1331,6 +1300,26 @@ export interface paths {
         /** Remove the deleted flag from a workflow. */
         post: operations["undelete_workflow_api_workflows__workflow_id__undelete_post"];
     };
+    "/api/workflows/{workflow_id}/versions": {
+        /** List all versions of a workflow. */
+        get: operations["show_versions_api_workflows__workflow_id__versions_get"];
+    };
+    "/ga4gh/drs/v1/objects/{object_id}": {
+        /** Get Object */
+        get: operations["get_object_ga4gh_drs_v1_objects__object_id__get"];
+        /** Get Object */
+        post: operations["get_object_ga4gh_drs_v1_objects__object_id__post"];
+    };
+    "/ga4gh/drs/v1/objects/{object_id}/access/{access_id}": {
+        /** Get Access Url */
+        get: operations["get_access_url_ga4gh_drs_v1_objects__object_id__access__access_id__get"];
+        /** Get Access Url */
+        post: operations["get_access_url_ga4gh_drs_v1_objects__object_id__access__access_id__post"];
+    };
+    "/ga4gh/drs/v1/service-info": {
+        /** Service Info */
+        get: operations["service_info_ga4gh_drs_v1_service_info_get"];
+    };
 }
 
 export type webhooks = Record<string, never>;
@@ -1351,6 +1340,46 @@ export interface components {
              */
             key: string;
         };
+        /** APIKeyResponse */
+        APIKeyResponse: {
+            /** Api Key */
+            api_key: string;
+        };
+        /** AccessMethod */
+        AccessMethod: {
+            /**
+             * Access Id
+             * @description An arbitrary string to be passed to the `/access` method to get an `AccessURL`. This string must be unique within the scope of a single object. Note that at least one of `access_url` and `access_id` must be provided.
+             */
+            access_id?: string;
+            /**
+             * Access Url
+             * @description An `AccessURL` that can be used to fetch the actual object bytes. Note that at least one of `access_url` and `access_id` must be provided.
+             */
+            access_url?: components["schemas"]["AccessURL"];
+            /**
+             * Region
+             * @description Name of the region in the cloud service provider that the object belongs to.
+             * @example us-east-1
+             */
+            region?: string;
+            /** @description Type of the access method. */
+            type: components["schemas"]["Type"];
+        };
+        /** AccessURL */
+        AccessURL: {
+            /**
+             * Headers
+             * @description An optional list of headers to include in the HTTP request to `url`. These headers can be used to provide auth tokens required to fetch the object bytes.
+             * @example Authorization: Basic Z2E0Z2g6ZHJz
+             */
+            headers?: string[];
+            /**
+             * Url
+             * @description A fully resolvable URL that can be used to fetch the actual object bytes.
+             */
+            url: string;
+        };
         /**
          * AsyncFile
          * @description Base model definition with common configuration used by all derived models.
@@ -1391,6 +1420,9 @@ export interface components {
             /**
              * ID
              * @description Encoded ID of the role
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
@@ -1486,6 +1518,22 @@ export interface components {
              */
             status: "ok" | "error";
         };
+        /** Checksum */
+        Checksum: {
+            /**
+             * Checksum
+             * @description The hex-string encoded checksum for the data
+             */
+            checksum: string;
+            /**
+             * Type
+             * @description The digest method used to create the checksum.
+             * The value (e.g. `sha-256`) SHOULD be listed as `Hash Name String` in the https://www.iana.org/assignments/named-information/named-information.xhtml#hash-alg[IANA Named Information Hash Algorithm Registry]. Other values MAY be used, as long as implementors are aware of the issues discussed in https://tools.ietf.org/html/rfc6920#section-9.4[RFC6920].
+             * GA4GH may provide more explicit guidance for use of non-IANA-registered algorithms in the future. Until then, if implementors do choose such an algorithm (e.g. because it's implemented by their storage provider), they SHOULD use an existing standard `type` value such as `md5`, `etag`, `crc32c`, `trunc512`, or `sha1`.
+             * @example sha-256
+             */
+            type: string;
+        };
         /**
          * CollectionElementIdentifier
          * @description Base model definition with common configuration used by all derived models.
@@ -1504,6 +1552,9 @@ export interface components {
             /**
              * ID
              * @description The encoded ID of the element.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id?: string;
             /**
@@ -1647,6 +1698,30 @@ export interface components {
              */
             hash_function?: components["schemas"]["HashFunctionNameEnum"];
         };
+        /** ContentsObject */
+        ContentsObject: {
+            /**
+             * Contents
+             * @description If this ContentsObject describes a nested bundle and the caller specified "?expand=true" on the request, then this contents array must be present and describe the objects within the nested bundle.
+             */
+            contents?: components["schemas"]["ContentsObject"][];
+            /**
+             * Drs Uri
+             * @description A list of full DRS identifier URI paths that may be used to obtain the object. These URIs may be external to this DRS instance.
+             * @example drs://drs.example.org/314159
+             */
+            drs_uri?: string[];
+            /**
+             * Id
+             * @description A DRS identifier of a `DrsObject` (either a single blob or a nested bundle). If this ContentsObject is an object within a nested bundle, then the id is optional. Otherwise, the id is required.
+             */
+            id?: string;
+            /**
+             * Name
+             * @description A name declared by the bundle author that must be used when materialising this object, overriding any name directly associated with the object itself. The name must be unique with the containing bundle. This string is made up of uppercase and lowercase letters, decimal digits, hyphen, period, and underscore [A-Za-z0-9.-_]. See http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_282[portable filenames].
+             */
+            name: string;
+        };
         /**
          * ConvertedDatasetsMap
          * @description Map of `file extension` -> `converted dataset encoded id`
@@ -1706,6 +1781,9 @@ export interface components {
             /**
              * Folder Id
              * @description The ID of the library folder that will contain the collection. Required if `instance_type=library`.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             folder_id?: string;
             /**
@@ -1717,6 +1795,9 @@ export interface components {
             /**
              * History Id
              * @description The ID of the history that will contain the collection. Required if `instance_type=history`.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             history_id?: string;
             /**
@@ -1773,11 +1854,17 @@ export interface components {
             /**
              * From HDA ID
              * @description The ID of an accessible HDA to copy into the library.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             from_hda_id?: string;
             /**
              * From HDCA ID
              * @description The ID of an accessible HDCA to copy into the library. Nested collections are not allowed, you must flatten the collection first.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             from_hdca_id?: string;
             /**
@@ -1867,6 +1954,9 @@ export interface components {
             /**
              * Folder Id
              * @description The ID of the library folder that will contain the collection. Required if `instance_type=library`.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             folder_id?: string;
             /**
@@ -1878,6 +1968,9 @@ export interface components {
             /**
              * History Id
              * @description The ID of the history that will contain the collection. Required if `instance_type=history`.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             history_id?: string;
             /**
@@ -1918,6 +2011,9 @@ export interface components {
             /**
              * Workflow invocation ID
              * @description Encoded ID used by workflow generated reports.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             invocation_id?: string;
             /**
@@ -1984,6 +2080,9 @@ export interface components {
             /**
              * ID
              * @description The `encoded identifier` of the quota.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
@@ -1994,6 +2093,7 @@ export interface components {
             /**
              * Model class
              * @description The name of the database model class.
+             * @default Quota
              * @enum {string}
              */
             model_class: "Quota";
@@ -2058,11 +2158,15 @@ export interface components {
             /**
              * ID
              * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
              * Model class
              * @description The name of the database model class.
+             * @default DatasetCollectionElement
              * @enum {string}
              */
             model_class: "DatasetCollectionElement";
@@ -2110,11 +2214,15 @@ export interface components {
             /**
              * ID
              * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
              * Model class
              * @description The name of the database model class.
+             * @default DatasetCollection
              * @enum {string}
              */
             model_class: "DatasetCollection";
@@ -2228,6 +2336,7 @@ export interface components {
             /**
              * Model class
              * @description The name of the database model class.
+             * @default HistoryDatasetCollectionAssociation
              * @enum {string}
              */
             model_class: "HistoryDatasetCollectionAssociation";
@@ -2302,6 +2411,9 @@ export interface components {
             /**
              * ID
              * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
@@ -2506,6 +2618,7 @@ export interface components {
             /**
              * Model class
              * @description The name of the database model class.
+             * @default DefaultQuotaAssociation
              * @enum {string}
              */
             model_class: "DefaultQuotaAssociation";
@@ -2601,6 +2714,9 @@ export interface components {
             /**
              * ID
              * @description The encoded ID of the history item.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
@@ -2641,12 +2757,6 @@ export interface components {
              */
             purge?: boolean;
         };
-        /**
-         * DirectionOptions
-         * @description An enumeration.
-         * @enum {string}
-         */
-        DirectionOptions: "near" | "before" | "after";
         /**
          * DisplayApp
          * @description Basic linked information about an application that can display certain datatypes.
@@ -2684,11 +2794,6 @@ export interface components {
              * @description The name of the file containing the exported history.
              */
             file_name?: string;
-            /**
-             * Force Rebuild
-             * @description Whether to force a rebuild of the history archive.
-             */
-            force?: boolean;
             /**
              * GZip
              * @description Whether to export as gzip archive.
@@ -2708,6 +2813,60 @@ export interface components {
              */
             include_hidden?: boolean;
         };
+        /**
+         * ExportObjectMetadata
+         * @description Base model definition with common configuration used by all derived models.
+         */
+        ExportObjectMetadata: {
+            request_data: components["schemas"]["ExportObjectRequestMetadata"];
+            result_data?: components["schemas"]["ExportObjectResultMetadata"];
+        };
+        /**
+         * ExportObjectRequestMetadata
+         * @description Base model definition with common configuration used by all derived models.
+         */
+        ExportObjectRequestMetadata: {
+            /**
+             * Object Id
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
+             */
+            object_id: string;
+            object_type: components["schemas"]["ExportObjectType"];
+            /** Payload */
+            payload:
+                | components["schemas"]["WriteStoreToPayload"]
+                | components["schemas"]["ShortTermStoreExportPayload"];
+            /**
+             * User Id
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
+             */
+            user_id?: string;
+        };
+        /**
+         * ExportObjectResultMetadata
+         * @description Base model definition with common configuration used by all derived models.
+         */
+        ExportObjectResultMetadata: {
+            /** Error */
+            error?: string;
+            /** Success */
+            success: boolean;
+        };
+        /**
+         * ExportObjectType
+         * @description Types of objects that can be exported.
+         * @enum {string}
+         */
+        ExportObjectType: "history" | "invocation";
+        /**
+         * ExportTaskListResponse
+         * @description Base model definition with common configuration used by all derived models.
+         */
+        ExportTaskListResponse: components["schemas"]["ObjectExportTaskResponse"][];
         /**
          * ExtraFiles
          * @description Base model definition with common configuration used by all derived models.
@@ -2731,6 +2890,9 @@ export interface components {
             /**
              * History ID
              * @description The encoded ID of the history associated with this item.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             history_id: string;
             /** Targets */
@@ -2822,13 +2984,23 @@ export interface components {
             file_ext: string;
             /** File Size */
             file_size: string;
-            /** Id */
+            /**
+             * Id
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
+             */
             id: string;
             /** Is Private */
             is_private: boolean;
             /** Is Unrestricted */
             is_unrestricted: boolean;
-            /** Ldda Id */
+            /**
+             * Ldda Id
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
+             */
             ldda_id: string;
             /** Message */
             message?: string;
@@ -2946,7 +3118,12 @@ export interface components {
              * @default
              */
             description?: string;
-            /** Id */
+            /**
+             * Id
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
+             */
             id: string;
             /** Name */
             name: string;
@@ -3055,11 +3232,15 @@ export interface components {
             /**
              * ID
              * @description Encoded group ID
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
              * Model class
              * @description The name of the database model class.
+             * @default Group
              * @enum {string}
              */
             model_class: "Group";
@@ -3082,6 +3263,7 @@ export interface components {
             /**
              * Model class
              * @description The name of the database model class.
+             * @default GroupQuotaAssociation
              * @enum {string}
              */
             model_class: "GroupQuotaAssociation";
@@ -3099,6 +3281,9 @@ export interface components {
             /**
              * ID
              * @description Encoded ID of the role
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
@@ -3131,6 +3316,9 @@ export interface components {
             /**
              * ID
              * @description Encoded ID of the user
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
@@ -3187,6 +3375,9 @@ export interface components {
             /**
              * Dataset ID
              * @description The encoded ID of the dataset associated with this item.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             dataset_id: string;
             /**
@@ -3255,11 +3446,17 @@ export interface components {
             /**
              * History ID
              * @description The encoded ID of the history associated with this item.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             history_id: string;
             /**
              * ID
              * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
@@ -3402,16 +3599,23 @@ export interface components {
             /**
              * History ID
              * @description The encoded ID of the history associated with this item.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             history_id: string;
             /**
              * ID
              * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
              * Model class
              * @description The name of the database model class.
+             * @default HistoryDatasetAssociation
              * @enum {string}
              */
             model_class: "HistoryDatasetAssociation";
@@ -3435,6 +3639,9 @@ export interface components {
             /**
              * Dataset ID
              * @description The encoded ID of the dataset associated with this item.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             dataset_id: string;
             /**
@@ -3461,11 +3668,17 @@ export interface components {
             /**
              * History ID
              * @description The encoded ID of the history associated with this item.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             history_id: string;
             /**
              * ID
              * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
@@ -3521,6 +3734,9 @@ export interface components {
             /**
              * Collection ID
              * @description The encoded ID of the dataset collection associated with this HDCA.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             collection_id: string;
             /**
@@ -3573,16 +3789,25 @@ export interface components {
             /**
              * History ID
              * @description The encoded ID of the history associated with this item.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             history_id: string;
             /**
              * ID
              * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
              * Job Source ID
              * @description The encoded ID of the Job that produced this dataset collection. Used to track the state of the job.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             job_source_id?: string;
             /**
@@ -3598,6 +3823,7 @@ export interface components {
             /**
              * Model class
              * @description The name of the database model class.
+             * @default HistoryDatasetCollectionAssociation
              * @enum {string}
              */
             model_class: "HistoryDatasetCollectionAssociation";
@@ -3661,6 +3887,9 @@ export interface components {
             /**
              * Collection ID
              * @description The encoded ID of the dataset collection associated with this HDCA.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             collection_id: string;
             /**
@@ -3702,16 +3931,25 @@ export interface components {
             /**
              * History ID
              * @description The encoded ID of the history associated with this item.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             history_id: string;
             /**
              * ID
              * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
              * Job Source ID
              * @description The encoded ID of the Job that produced this dataset collection. Used to track the state of the job.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             job_source_id?: string;
             /**
@@ -3727,6 +3965,7 @@ export interface components {
             /**
              * Model class
              * @description The name of the database model class.
+             * @default HistoryDatasetCollectionAssociation
              * @enum {string}
              */
             model_class: "HistoryDatasetCollectionAssociation";
@@ -3955,169 +4194,6 @@ export interface components {
              */
             type: "hdca";
         };
-        /**
-         * HistoryActiveContentCounts
-         * @description Contains the number of active, deleted or hidden items in a History.
-         */
-        HistoryActiveContentCounts: {
-            /**
-             * Active
-             * @description Number of active datasets.
-             */
-            active: number;
-            /**
-             * Deleted
-             * @description Number of deleted datasets.
-             */
-            deleted: number;
-            /**
-             * Hidden
-             * @description Number of hidden datasets.
-             */
-            hidden: number;
-        };
-        /**
-         * HistoryBeta
-         * @description History detailed information used in the new Beta History.
-         */
-        HistoryBeta: {
-            /**
-             * Annotation
-             * @description An annotation to provide details or to help understand the purpose and usage of this item.
-             */
-            annotation: string;
-            /**
-             * Active Contents
-             * @description Contains the number of active, deleted or hidden items in the History.
-             */
-            contents_active: components["schemas"]["HistoryActiveContentCounts"];
-            /**
-             * Contents URL
-             * @description The relative URL to access the contents of this History.
-             */
-            contents_url: string;
-            /**
-             * Count
-             * @description The number of items in the history.
-             */
-            count: number;
-            /**
-             * Create Time
-             * Format: date-time
-             * @description The time and date this item was created.
-             */
-            create_time: string;
-            /**
-             * Deleted
-             * @description Whether this item is marked as deleted.
-             */
-            deleted: boolean;
-            /**
-             * Empty
-             * @description Whether this History has any content.
-             */
-            empty: boolean;
-            /**
-             * Genome Build
-             * @description TODO
-             * @default ?
-             */
-            genome_build?: string;
-            /**
-             * HID Counter
-             * @description TODO
-             */
-            hid_counter: number;
-            /**
-             * ID
-             * @description The encoded ID of this entity.
-             */
-            id: string;
-            /**
-             * Importable
-             * @description Whether this History can be imported by other users with a shared link.
-             */
-            importable: boolean;
-            /**
-             * Model class
-             * @description The name of the database model class.
-             * @enum {string}
-             */
-            model_class: "History";
-            /**
-             * Name
-             * @description The name of the history.
-             */
-            name: string;
-            /**
-             * Nice Size
-             * @description Human-readable size of the contents of this history.
-             * @example 95.4 MB
-             */
-            nice_size: string;
-            /**
-             * Published
-             * @description Whether this resource is currently publicly available to all users.
-             */
-            published: boolean;
-            /**
-             * Purged
-             * @description Whether this History has been permanently removed.
-             */
-            purged: boolean;
-            /**
-             * Size
-             * @description The total size of the contents of this history in bytes.
-             */
-            size: number;
-            /**
-             * Slug
-             * @description Part of the URL to uniquely identify this History by link in a readable way.
-             */
-            slug?: string;
-            /**
-             * State
-             * @description The current state of the History based on the states of the datasets it contains.
-             */
-            state: components["schemas"]["galaxy__model__Dataset__states"];
-            /**
-             * State Counts
-             * @description A dictionary keyed to possible dataset states and valued with the number of datasets in this history that have those states.
-             */
-            state_details: {
-                [key: string]: number | undefined;
-            };
-            /**
-             * State IDs
-             * @description A dictionary keyed to possible dataset states and valued with lists containing the ids of each HDA in that state.
-             */
-            state_ids: {
-                [key: string]: string[] | undefined;
-            };
-            tags: components["schemas"]["TagCollection"];
-            /**
-             * Update Time
-             * Format: date-time
-             * @description The last time and date this item was updated.
-             */
-            update_time: string;
-            /**
-             * URL
-             * @deprecated
-             * @description The relative URL to access this item.
-             */
-            url: string;
-            /**
-             * User ID
-             * @description The encoded ID of the user that owns this History.
-             */
-            user_id: string;
-            /**
-             * Username and slug
-             * @description The relative URL in the form of /u/{username}/h/{slug}
-             */
-            username_and_slug?: string;
-        };
         /**
          * HistoryContentBulkOperationPayload
          * @description Base model definition with common configuration used by all derived models.
@@ -4155,6 +4231,9 @@ export interface components {
             /**
              * ID
              * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
         };
@@ -4270,6 +4349,9 @@ export interface components {
             /**
              * ID
              * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
@@ -4280,6 +4362,7 @@ export interface components {
             /**
              * Model class
              * @description The name of the database model class.
+             * @default History
              * @enum {string}
              */
             model_class: "History";
@@ -4343,6 +4426,9 @@ export interface components {
             /**
              * User ID
              * @description The encoded ID of the user that owns this History.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             user_id: string;
             /**
@@ -4374,11 +4460,15 @@ export interface components {
             /**
              * ID
              * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
              * Model class
              * @description The name of the database model class.
+             * @default History
              * @enum {string}
              */
             model_class: "History";
@@ -4436,11 +4526,15 @@ export interface components {
             /**
              * ID
              * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
              * Model class
              * @description The name of the database model class.
+             * @default ImplicitCollectionJobs
              * @enum {string}
              */
             model: "ImplicitCollectionJobs";
@@ -4458,18 +4552,62 @@ export interface components {
                 [key: string]: number | undefined;
             };
         };
+        /** ImportToolDataBundle */
+        ImportToolDataBundle: {
+            /** Source */
+            source:
+                | components["schemas"]["ImportToolDataBundleDatasetSource"]
+                | components["schemas"]["ImportToolDataBundleUriSource"];
+        };
+        /**
+         * ImportToolDataBundleDatasetSource
+         * @description Base model definition with common configuration used by all derived models.
+         */
+        ImportToolDataBundleDatasetSource: {
+            /**
+             * ID
+             * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
+             */
+            id: string;
+            /**
+             * src
+             * @description Indicates that the tool data should be resolved from a dataset.
+             * @enum {string}
+             */
+            src: "hda" | "ldda";
+        };
+        /**
+         * ImportToolDataBundleUriSource
+         * @description Base model definition with common configuration used by all derived models.
+         */
+        ImportToolDataBundleUriSource: {
+            /**
+             * src
+             * @description Indicates that the tool data should be resolved by a URI.
+             * @enum {string}
+             */
+            src: "uri";
+            /**
+             * uri
+             * @description URI to fetch tool data bundle from (file:// URIs are fine because this is an admin-only operation)
+             */
+            uri: string;
+        };
         /**
          * InstalledRepositoryToolShedStatus
          * @description Base model definition with common configuration used by all derived models.
          */
         InstalledRepositoryToolShedStatus: {
             /**
-             * Latest Installable Revision
-             * @description Most recent version avialable on the tool shed
+             * Latest installed revision
+             * @description Most recent version available on the tool shed
              */
             latest_installable_revision: string;
             /**
-             * Repository Deprecated
+             * Repository deprecated
              * @description Repository has been depreciated on the tool shed
              */
             repository_deprecated: string;
@@ -4484,12 +4622,12 @@ export interface components {
          */
         InstalledToolShedRepository: {
             /**
-             * Changeset Revision
+             * Changeset revision
              * @description Changeset revision of the repository - a mercurial commit hash
              */
             changeset_revision: string;
             /**
-             * Ctx Rev
+             * Changeset revision number
              * @description The linearized 0-based index of the changeset on the tool shed (0, 1, 2,...)
              */
             ctx_rev: string;
@@ -4505,10 +4643,13 @@ export interface components {
             /**
              * ID
              * @description Encoded ID of the install tool shed repository.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
-             * Installed Changeset Revision
+             * Installed changeset revision
              * @description Initially installed changeset revision. Used to construct path to repository within Galaxies filesystem. Does not change if a repository is updated.
              */
             installed_changeset_revision: string;
@@ -4518,7 +4659,7 @@ export interface components {
              * @default ToolShedRepository
              * @enum {string}
              */
-            model_class?: "ToolShedRepository";
+            model_class: "ToolShedRepository";
             /**
              * Name
              * @description Name of repository
@@ -4532,11 +4673,11 @@ export interface components {
             /** Status */
             status: string;
             /**
-             * Tool Shed
+             * Tool shed
              * @description Hostname of the tool shed this was installed from
              */
             tool_shed: string;
-            /** Tool Shed Status */
+            /** Latest updated status from the tool shed */
             tool_shed_status?: components["schemas"]["InstalledRepositoryToolShedStatus"];
             /** Uninstalled */
             uninstalled: boolean;
@@ -4554,6 +4695,9 @@ export interface components {
             /**
              * Item ID
              * @description The `encoded identifier` of the item whose tags will be updated.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             item_id: string;
             /**
@@ -4569,10 +4713,10 @@ export interface components {
          */
         ItemsFromSrc: "url" | "files" | "path" | "ftp_import" | "server_dir";
         /**
-         * JobExportHistoryArchiveCollection
+         * JobExportHistoryArchiveListResponse
          * @description Base model definition with common configuration used by all derived models.
          */
-        JobExportHistoryArchiveCollection: components["schemas"]["JobExportHistoryArchiveModel"][];
+        JobExportHistoryArchiveListResponse: components["schemas"]["JobExportHistoryArchiveModel"][];
         /**
          * JobExportHistoryArchiveModel
          * @description Base model definition with common configuration used by all derived models.
@@ -4597,27 +4741,33 @@ export interface components {
             external_download_permanent_url: string;
             /**
              * ID
-             * @description The encoded database ID of the job that is currently processing a particular request.
+             * @description The encoded database ID of the export request.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
              * Job ID
              * @description The encoded database ID of the job that generated this history export archive.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             job_id: string;
             /**
              * Preparing
-             * @description Whether the history archive is currently being built or in preparation.
+             * @description Whether the archive is currently being built or in preparation.
              */
             preparing: boolean;
             /**
              * Ready
-             * @description Whether the export history job has completed successfully and the archive is ready to download
+             * @description Whether the export has completed successfully and the archive is ready
              */
             ready: boolean;
             /**
              * Up to Date
-             * @description False, if a new export archive should be generated for the corresponding history.
+             * @description False, if a new export archive should be generated.
              */
             up_to_date: boolean;
         };
@@ -4629,6 +4779,9 @@ export interface components {
             /**
              * Job ID
              * @description The encoded database ID of the job that is currently processing a particular request.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             job_id: string;
         };
@@ -4657,11 +4810,17 @@ export interface components {
             /**
              * History ID
              * @description The encoded ID of the history associated with this item.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             history_id?: string;
             /**
              * ID
              * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
@@ -4672,6 +4831,7 @@ export interface components {
             /**
              * Model class
              * @description The name of the database model class.
+             * @default Job
              * @enum {string}
              */
             model_class: "Job";
@@ -4726,11 +4886,15 @@ export interface components {
             /**
              * ID
              * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
              * Model class
              * @description The name of the database model class.
+             * @default Job
              * @enum {string}
              */
             model: "Job";
@@ -4916,7 +5080,12 @@ export interface components {
          * @description Base model definition with common configuration used by all derived models.
          */
         LibraryFolderDestination: {
-            /** Library Folder Id */
+            /**
+             * Library Folder Id
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
+             */
             library_folder_id: string;
             /**
              * Type
@@ -4949,6 +5118,9 @@ export interface components {
             /**
              * ID
              * @description Encoded ID of the library folder.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
@@ -4965,6 +5137,7 @@ export interface components {
             /**
              * Model class
              * @description The name of the database model class.
+             * @default LibraryFolder
              * @enum {string}
              */
             model_class: "LibraryFolder";
@@ -4976,11 +5149,17 @@ export interface components {
             /**
              * Parent Folder ID
              * @description Encoded ID of the parent folder. Empty if it's the root folder.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             parent_id?: string;
             /**
              * Parent Library ID
              * @description Encoded ID of the Library this folder belongs to.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             parent_library_id: string;
             /**
@@ -5005,7 +5184,12 @@ export interface components {
             folder_name: string;
             /** Full Path */
             full_path: string[][];
-            /** Parent Library Id */
+            /**
+             * Parent Library Id
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
+             */
             parent_library_id: string;
             /** Total Rows */
             total_rows: number;
@@ -5070,11 +5254,15 @@ export interface components {
             /**
              * ID
              * @description Encoded ID of the Library.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
              * Model class
              * @description The name of the database model class.
+             * @default Library
              * @enum {string}
              */
             model_class: "Library";
@@ -5086,6 +5274,9 @@ export interface components {
             /**
              * Root Folder ID
              * @description Encoded ID of the Library's base folder.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             root_folder_id: string;
             /**
@@ -5187,11 +5378,15 @@ export interface components {
             /**
              * ID
              * @description Encoded ID of the Library.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
              * Model class
              * @description The name of the database model class.
+             * @default Library
              * @enum {string}
              */
             model_class: "Library";
@@ -5208,6 +5403,9 @@ export interface components {
             /**
              * Root Folder ID
              * @description Encoded ID of the Library's base folder.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             root_folder_id: string;
             /**
@@ -5300,6 +5498,10 @@ export interface components {
              * @description Depending on the `source` it can be:
              * - The encoded id of the source library dataset
              * - The encoded id of the the HDA
+             *
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             content?: string;
             /**
@@ -5348,6 +5550,96 @@ export interface components {
              */
             time: string;
         };
+        /** Model */
+        Model: {
+            /**
+             * Access Methods
+             * @description The list of access methods that can be used to fetch the `DrsObject`.
+             * Required for single blobs; optional for bundles.
+             */
+            access_methods?: components["schemas"]["AccessMethod"][];
+            /**
+             * Aliases
+             * @description A list of strings that can be used to find other metadata about this `DrsObject` from external metadata sources. These aliases can be used to represent secondary accession numbers or external GUIDs.
+             */
+            aliases?: string[];
+            /**
+             * Checksums
+             * @description The checksum of the `DrsObject`. At least one checksum must be provided.
+             * For blobs, the checksum is computed over the bytes in the blob.
+             * For bundles, the checksum is computed over a sorted concatenation of the checksums of its top-level contained objects (not recursive, names not included). The list of checksums is sorted alphabetically (hex-code) before concatenation and a further checksum is performed on the concatenated checksum value.
+             * For example, if a bundle contains blobs with the following checksums:
+             * md5(blob1) = 72794b6d
+             * md5(blob2) = 5e089d29
+             * Then the checksum of the bundle is:
+             * md5( concat( sort( md5(blob1), md5(blob2) ) ) )
+             * = md5( concat( sort( 72794b6d, 5e089d29 ) ) )
+             * = md5( concat( 5e089d29, 72794b6d ) )
+             * = md5( 5e089d2972794b6d )
+             * = f7a29a04
+             */
+            checksums: components["schemas"]["Checksum"][];
+            /**
+             * Contents
+             * @description If not set, this `DrsObject` is a single blob.
+             * If set, this `DrsObject` is a bundle containing the listed `ContentsObject` s (some of which may be further nested).
+             */
+            contents?: components["schemas"]["ContentsObject"][];
+            /**
+             * Created Time
+             * Format: date-time
+             * @description Timestamp of content creation in RFC3339.
+             * (This is the creation time of the underlying content, not of the JSON object.)
+             */
+            created_time: string;
+            /**
+             * Description
+             * @description A human readable description of the `DrsObject`.
+             */
+            description?: string;
+            /**
+             * Id
+             * @description An identifier unique to this `DrsObject`
+             */
+            id: string;
+            /**
+             * Mime Type
+             * @description A string providing the mime-type of the `DrsObject`.
+             * @example application/json
+             */
+            mime_type?: string;
+            /**
+             * Name
+             * @description A string that can be used to name a `DrsObject`.
+             * This string is made up of uppercase and lowercase letters, decimal digits, hyphen, period, and underscore [A-Za-z0-9.-_]. See http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_282[portable filenames].
+             */
+            name?: string;
+            /**
+             * Self Uri
+             * @description A drs:// hostname-based URI, as defined in the DRS documentation, that tells clients how to access this object.
+             * The intent of this field is to make DRS objects self-contained, and therefore easier for clients to store and pass around.  For example, if you arrive at this DRS JSON by resolving a compact identifier-based DRS URI, the `self_uri` presents you with a hostname and properly encoded DRS ID for use in subsequent `access` endpoint calls.
+             * @example drs://drs.example.org/314159
+             */
+            self_uri: string;
+            /**
+             * Size
+             * @description For blobs, the blob size in bytes.
+             * For bundles, the cumulative size, in bytes, of items in the `contents` field.
+             */
+            size: number;
+            /**
+             * Updated Time
+             * Format: date-time
+             * @description Timestamp of content update in RFC3339, identical to `created_time` in systems that do not support updates. (This is the update time of the underlying content, not of the JSON object.)
+             */
+            updated_time?: string;
+            /**
+             * Version
+             * @description A string representing a version.
+             * (Some systems may use checksum, a RFC3339 timestamp, or an incrementing version number.)
+             */
+            version?: string;
+        };
         /**
          * ModelStoreFormat
          * @description Available types of model stores for export.
@@ -5418,6 +5710,64 @@ export interface components {
              */
             to_posix_lines?: boolean;
         };
+        /**
+         * ObjectExportTaskResponse
+         * @description Base model definition with common configuration used by all derived models.
+         */
+        ObjectExportTaskResponse: {
+            /**
+             * Create Time
+             * Format: date-time
+             * @description The time and date this item was created.
+             */
+            create_time: string;
+            export_metadata?: components["schemas"]["ExportObjectMetadata"];
+            /**
+             * ID
+             * @description The encoded database ID of the export request.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
+             */
+            id: string;
+            /**
+             * Preparing
+             * @description Whether the archive is currently being built or in preparation.
+             */
+            preparing: boolean;
+            /**
+             * Ready
+             * @description Whether the export has completed successfully and the archive is ready
+             */
+            ready: boolean;
+            /**
+             * Task ID
+             * Format: uuid4
+             * @description The identifier of the task processing the export.
+             */
+            task_uuid: string;
+            /**
+             * Up to Date
+             * @description False, if a new export archive should be generated.
+             */
+            up_to_date: boolean;
+        };
+        /** Organization */
+        Organization: {
+            /**
+             * Name
+             * @description Name of the organization responsible for the service
+             * @example My organization
+             */
+            name: string;
+            /**
+             * Url
+             * Format: uri
+             * @description URL of the website of the organization (RFC 3986 format)
+             * @example https://example.com
+             */
+            url: string;
+        };
         /**
          * PageContentFormat
          * @description An enumeration.
@@ -5464,6 +5814,9 @@ export interface components {
             /**
              * ID
              * @description Encoded ID of the Page.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
@@ -5474,11 +5827,15 @@ export interface components {
             /**
              * Latest revision ID
              * @description The encoded ID of the last revision of this Page.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             latest_revision_id: string;
             /**
              * Model class
              * @description The name of the database model class.
+             * @default Page
              * @enum {string}
              */
             model_class: "Page";
@@ -5532,6 +5889,9 @@ export interface components {
             /**
              * ID
              * @description Encoded ID of the Page.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
@@ -5542,11 +5902,15 @@ export interface components {
             /**
              * Latest revision ID
              * @description The encoded ID of the last revision of this Page.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             latest_revision_id: string;
             /**
              * Model class
              * @description The name of the database model class.
+             * @default Page
              * @enum {string}
              */
             model_class: "Page";
@@ -5799,11 +6163,15 @@ export interface components {
             /**
              * ID
              * @description The `encoded identifier` of the quota.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
              * Model class
              * @description The name of the database model class.
+             * @default Quota
              * @enum {string}
              */
             model_class: "Quota";
@@ -5839,11 +6207,15 @@ export interface components {
             /**
              * ID
              * @description The `encoded identifier` of the quota.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
              * Model class
              * @description The name of the database model class.
+             * @default Quota
              * @enum {string}
              */
             model_class: "Quota";
@@ -5941,11 +6313,15 @@ export interface components {
             /**
              * ID
              * @description Encoded ID of the role
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
              * Model class
              * @description The name of the database model class.
+             * @default Role
              * @enum {string}
              */
             model_class: "Role";
@@ -6026,6 +6402,94 @@ export interface components {
              */
             to_posix_lines?: boolean;
         };
+        /** Service */
+        Service: {
+            /**
+             * Contacturl
+             * Format: uri
+             * @description URL of the contact for the provider of this service, e.g. a link to a contact form (RFC 3986 format), or an email (RFC 2368 format).
+             * @example mailto:support@example.com
+             */
+            contactUrl?: string;
+            /**
+             * Createdat
+             * Format: date-time
+             * @description Timestamp describing when the service was first deployed and available (RFC 3339 format)
+             * @example 2019-06-04T12:58:19Z
+             */
+            createdAt?: string;
+            /**
+             * Description
+             * @description Description of the service. Should be human readable and provide information about the service.
+             * @example This service provides...
+             */
+            description?: string;
+            /**
+             * Documentationurl
+             * Format: uri
+             * @description URL of the documentation of this service (RFC 3986 format). This should help someone learn how to use your service, including any specifics required to access data, e.g. authentication.
+             * @example https://docs.myservice.example.com
+             */
+            documentationUrl?: string;
+            /**
+             * Environment
+             * @description Environment the service is running in. Use this to distinguish between production, development and testing/staging deployments. Suggested values are prod, test, dev, staging. However this is advised and not enforced.
+             * @example test
+             */
+            environment?: string;
+            /**
+             * Id
+             * @description Unique ID of this service. Reverse domain name notation is recommended, though not required. The identifier should attempt to be globally unique so it can be used in downstream aggregator services e.g. Service Registry.
+             * @example org.ga4gh.myservice
+             */
+            id: string;
+            /**
+             * Name
+             * @description Name of this service. Should be human readable.
+             * @example My project
+             */
+            name: string;
+            /**
+             * Organization
+             * @description Organization providing the service
+             */
+            organization: components["schemas"]["Organization"];
+            type: components["schemas"]["ServiceType"];
+            /**
+             * Updatedat
+             * Format: date-time
+             * @description Timestamp describing when the service was last updated (RFC 3339 format)
+             * @example 2019-06-04T12:58:19Z
+             */
+            updatedAt?: string;
+            /**
+             * Version
+             * @description Version of the service being described. Semantic versioning is recommended, but other identifiers, such as dates or commit hashes, are also allowed. The version should be changed whenever the service is updated.
+             * @example 1.0.0
+             */
+            version: string;
+        };
+        /** ServiceType */
+        ServiceType: {
+            /**
+             * Artifact
+             * @description Name of the API or GA4GH specification implemented. Official GA4GH types should be assigned as part of standards approval process. Custom artifacts are supported.
+             * @example beacon
+             */
+            artifact: string;
+            /**
+             * Group
+             * @description Namespace in reverse domain name format. Use `org.ga4gh` for implementations compliant with official GA4GH specifications. For services with custom APIs not standardized by GA4GH, or implementations diverging from official GA4GH specifications, use a different namespace (e.g. your organization's reverse domain name).
+             * @example org.ga4gh
+             */
+            group: string;
+            /**
+             * Version
+             * @description Version of the API or specification. GA4GH specifications use semantic versioning.
+             * @example 1.0.0
+             */
+            version: string;
+        };
         /**
          * SetSlugPayload
          * @description Base model definition with common configuration used by all derived models.
@@ -6093,6 +6557,9 @@ export interface components {
             /**
              * ID
              * @description The encoded ID of the resource to be shared.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
@@ -6146,6 +6613,9 @@ export interface components {
             /**
              * ID
              * @description The encoded ID of the resource to be shared.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
@@ -6180,6 +6650,42 @@ export interface components {
              */
             users_shared_with?: components["schemas"]["UserEmail"][];
         };
+        /**
+         * ShortTermStoreExportPayload
+         * @description Base model definition with common configuration used by all derived models.
+         */
+        ShortTermStoreExportPayload: {
+            /** Duration */
+            duration?: number | number;
+            /**
+             * Include deleted
+             * @description Include file contents for deleted datasets (if include_files is True).
+             * @default false
+             */
+            include_deleted?: boolean;
+            /**
+             * Include Files
+             * @description include materialized files in export when available
+             * @default true
+             */
+            include_files?: boolean;
+            /**
+             * Include hidden
+             * @description Include file contents for hidden datasets (if include_files is True).
+             * @default false
+             */
+            include_hidden?: boolean;
+            /**
+             * @description format of model store to export
+             * @default tar.gz
+             */
+            model_store_format?: components["schemas"]["ModelStoreFormat"];
+            /**
+             * Short Term Storage Request Id
+             * Format: uuid
+             */
+            short_term_storage_request_id: string;
+        };
         /**
          * Src
          * @description An enumeration.
@@ -6477,6 +6983,12 @@ export interface components {
              */
             title?: string;
         };
+        /**
+         * Type
+         * @description An enumeration.
+         * @enum {unknown}
+         */
+        Type: "s3" | "gs" | "ftp" | "gsiftp" | "globus" | "htsget" | "https" | "file";
         /**
          * UpdateCollectionAttributePayload
          * @description Contains attributes that can be updated for all elements in a dataset collection.
@@ -6501,6 +7013,9 @@ export interface components {
             /**
              * ID
              * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
         };
@@ -6686,6 +7201,9 @@ export interface components {
             /**
              * User ID
              * @description The encoded ID of the user.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
         };
@@ -6712,6 +7230,9 @@ export interface components {
             /**
              * ID
              * @description User ID
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
@@ -6722,6 +7243,7 @@ export interface components {
             /**
              * Model class
              * @description The name of the database model class.
+             * @default User
              * @enum {string}
              */
             model_class: "User";
@@ -6739,6 +7261,7 @@ export interface components {
             /**
              * Model class
              * @description The name of the database model class.
+             * @default UserQuotaAssociation
              * @enum {string}
              */
             model_class: "UserQuotaAssociation";
@@ -6770,11 +7293,15 @@ export interface components {
             /**
              * ID
              * @description The encoded ID of this entity.
+             * @example [
+             *   "0123456789ABCDEF"
+             * ]
              */
             id: string;
             /**
              * Model class
              * @description The name of the database model class.
+             * @default WorkflowInvocation
              * @enum {string}
              */
             model: "WorkflowInvocation";
@@ -6914,11 +7441,17 @@ export interface components {
             /**
              * Name
              * @description Name of external reference
+             * @example [
+             *   "PubChem-compound"
+             * ]
              */
             name: string;
             /**
              * Namespace
              * @description External resource vendor prefix
+             * @example [
+             *   "pubchem.compound"
+             * ]
              */
             namespace: string;
         };
@@ -6984,6 +7517,17 @@ export interface components {
 export type external = Record<string, never>;
 
 export interface operations {
+    get_api_key_api_authenticate_baseauth_get: {
+        /** Returns returns an API key for authenticated user based on BaseAuth headers. */
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["APIKeyResponse"];
+                };
+            };
+        };
+    };
     index_api_configuration_get: {
         /**
          * Return an object containing exposable configuration settings
@@ -7336,15 +7880,13 @@ export interface operations {
             header?: {
                 "run-as"?: string;
             };
-            /** @description The ID of the History. */
             /** @description The ID of the `HDCA` contained in the history. */
             path: {
-                history_id: string;
                 id: string;
             };
         };
         responses: {
-            /** @description Successful Response */
+            /** @description Short term storage reference for async monitoring of this download. */
             200: {
                 content: {
                     "application/json": components["schemas"]["AsyncFile"];
@@ -7356,6 +7898,8 @@ export interface operations {
                     "application/json": components["schemas"]["HTTPValidationError"];
                 };
             };
+            /** @description Required asynchronous tasks required for this operation not available. */
+            501: never;
         };
     };
     suitable_converters_api_dataset_collections__id__suitable_converters_get: {
@@ -7392,7 +7936,7 @@ export interface operations {
     index_api_datasets_get: {
         /** Search datasets or collections using a query system. */
         parameters?: {
-            /** @description Optional identifier of a History. Use it to restrict the search whithin a particular History. */
+            /** @description Optional identifier of a History. Use it to restrict the search within a particular History. */
             /** @description View to be passed to the serializer */
             /** @description Comma-separated list of keys to be passed to the serializer */
             /**
@@ -8031,6 +8575,29 @@ export interface operations {
             };
         };
     };
+    download_api_drs_download__object_id__get: {
+        /** Download */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The ID of the group */
+            path: {
+                object_id: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: never;
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
     index_api_folders__folder_id__contents_get: {
         /**
          * Returns a list of a folder's contents (files and sub-folders) with additional metadata about the folder.
@@ -8568,7 +9135,7 @@ export interface operations {
             };
         };
     };
-    group_role_api_groups__group_id__roles__id__get: {
+    group_role_api_groups__group_id__roles__role_id__get: {
         /** Displays information about a group role. */
         parameters: {
             /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
@@ -8579,7 +9146,7 @@ export interface operations {
             /** @description The ID of the role */
             path: {
                 group_id: string;
-                id: string;
+                role_id: string;
             };
         };
         responses: {
@@ -8655,11 +9222,10 @@ export interface operations {
             };
         };
     };
-    group_user_api_groups__group_id__user__id__get: {
+    group_user_api_groups__group_id__user__user_id__get: {
         /**
          * Displays information about a group user.
-         * @description GET /api/groups/{encoded_group_id}/users/{encoded_user_id}
-         * Displays information about a group user.
+         * @description Displays information about a group user.
          */
         parameters: {
             /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
@@ -8670,7 +9236,7 @@ export interface operations {
             /** @description The ID of the user */
             path: {
                 group_id: string;
-                id: string;
+                user_id: string;
             };
         };
         responses: {
@@ -8785,11 +9351,10 @@ export interface operations {
             };
         };
     };
-    group_user_api_groups__group_id__users__id__get: {
+    group_user_api_groups__group_id__users__user_id__get: {
         /**
          * Displays information about a group user.
-         * @description GET /api/groups/{encoded_group_id}/users/{encoded_user_id}
-         * Displays information about a group user.
+         * @description Displays information about a group user.
          */
         parameters: {
             /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
@@ -8800,7 +9365,7 @@ export interface operations {
             /** @description The ID of the user */
             path: {
                 group_id: string;
-                id: string;
+                user_id: string;
             };
         };
         responses: {
@@ -8929,9 +9494,8 @@ export interface operations {
             200: {
                 content: {
                     "application/json": (
-                        | components["schemas"]["HistoryBeta"]
-                        | components["schemas"]["HistoryDetailed"]
                         | components["schemas"]["HistorySummary"]
+                        | components["schemas"]["HistoryDetailed"]
                         | Record<string, never>
                     )[];
                 };
@@ -8972,9 +9536,8 @@ export interface operations {
                 content: {
                     "application/json":
                         | components["schemas"]["JobImportHistoryResponse"]
-                        | components["schemas"]["HistoryBeta"]
-                        | components["schemas"]["HistoryDetailed"]
                         | components["schemas"]["HistorySummary"]
+                        | components["schemas"]["HistoryDetailed"]
                         | Record<string, never>;
                 };
             };
@@ -9026,9 +9589,8 @@ export interface operations {
             200: {
                 content: {
                     "application/json": (
-                        | components["schemas"]["HistoryBeta"]
-                        | components["schemas"]["HistoryDetailed"]
                         | components["schemas"]["HistorySummary"]
+                        | components["schemas"]["HistoryDetailed"]
                         | Record<string, never>
                     )[];
                 };
@@ -9041,7 +9603,7 @@ export interface operations {
             };
         };
     };
-    undelete_api_histories_deleted__id__undelete_post: {
+    undelete_api_histories_deleted__history_id__undelete_post: {
         /** Restores a deleted history with the given ID (that hasn't been purged). */
         parameters: {
             /** @description View to be passed to the serializer */
@@ -9056,7 +9618,7 @@ export interface operations {
             };
             /** @description The encoded database identifier of the History. */
             path: {
-                id: string;
+                history_id: string;
             };
         };
         responses: {
@@ -9064,9 +9626,8 @@ export interface operations {
             200: {
                 content: {
                     "application/json":
-                        | components["schemas"]["HistoryBeta"]
-                        | components["schemas"]["HistoryDetailed"]
                         | components["schemas"]["HistorySummary"]
+                        | components["schemas"]["HistoryDetailed"]
                         | Record<string, never>;
                 };
             };
@@ -9102,9 +9663,8 @@ export interface operations {
             200: {
                 content: {
                     "application/json":
-                        | components["schemas"]["HistoryBeta"]
-                        | components["schemas"]["HistoryDetailed"]
                         | components["schemas"]["HistorySummary"]
+                        | components["schemas"]["HistoryDetailed"]
                         | Record<string, never>;
                 };
             };
@@ -9133,11 +9693,7 @@ export interface operations {
             /** @description Successful Response */
             200: {
                 content: {
-                    "application/json":
-                        | components["schemas"]["HistoryBeta"]
-                        | components["schemas"]["HistoryDetailed"]
-                        | components["schemas"]["HistorySummary"]
-                        | Record<string, never>;
+                    "application/json": components["schemas"]["AsyncTaskResultSummary"];
                 };
             };
             /** @description Validation Error */
@@ -9167,9 +9723,8 @@ export interface operations {
             200: {
                 content: {
                     "application/json":
-                        | components["schemas"]["HistoryBeta"]
-                        | components["schemas"]["HistoryDetailed"]
                         | components["schemas"]["HistorySummary"]
+                        | components["schemas"]["HistoryDetailed"]
                         | Record<string, never>;
                 };
             };
@@ -9219,9 +9774,8 @@ export interface operations {
             200: {
                 content: {
                     "application/json": (
-                        | components["schemas"]["HistoryBeta"]
-                        | components["schemas"]["HistoryDetailed"]
                         | components["schemas"]["HistorySummary"]
+                        | components["schemas"]["HistoryDetailed"]
                         | Record<string, never>
                     )[];
                 };
@@ -9272,9 +9826,8 @@ export interface operations {
             200: {
                 content: {
                     "application/json": (
-                        | components["schemas"]["HistoryBeta"]
-                        | components["schemas"]["HistoryDetailed"]
                         | components["schemas"]["HistorySummary"]
+                        | components["schemas"]["HistoryDetailed"]
                         | Record<string, never>
                     )[];
                 };
@@ -9287,6 +9840,152 @@ export interface operations {
             };
         };
     };
+    history_api_histories__history_id__get: {
+        /** Returns the history with the given ID. */
+        parameters: {
+            /** @description View to be passed to the serializer */
+            /** @description Comma-separated list of keys to be passed to the serializer */
+            query?: {
+                view?: string;
+                keys?: string;
+            };
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The encoded database identifier of the History. */
+            path: {
+                history_id: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json":
+                        | components["schemas"]["HistorySummary"]
+                        | components["schemas"]["HistoryDetailed"]
+                        | Record<string, never>;
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    update_api_histories__history_id__put: {
+        /** Updates the values for the history with the given ID. */
+        parameters: {
+            /** @description View to be passed to the serializer */
+            /** @description Comma-separated list of keys to be passed to the serializer */
+            query?: {
+                view?: string;
+                keys?: string;
+            };
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The encoded database identifier of the History. */
+            path: {
+                history_id: string;
+            };
+        };
+        requestBody: {
+            content: {
+                "application/json": Record<string, never>;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json":
+                        | components["schemas"]["HistorySummary"]
+                        | components["schemas"]["HistoryDetailed"]
+                        | Record<string, never>;
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    delete_api_histories__history_id__delete: {
+        /** Marks the history with the given ID as deleted. */
+        parameters: {
+            /** @description View to be passed to the serializer */
+            /** @description Comma-separated list of keys to be passed to the serializer */
+            query?: {
+                purge?: boolean;
+                view?: string;
+                keys?: string;
+            };
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The encoded database identifier of the History. */
+            path: {
+                history_id: string;
+            };
+        };
+        requestBody?: {
+            content: {
+                "application/json": components["schemas"]["DeleteHistoryPayload"];
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json":
+                        | components["schemas"]["HistorySummary"]
+                        | components["schemas"]["HistoryDetailed"]
+                        | Record<string, never>;
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    citations_api_histories__history_id__citations_get: {
+        /** Return all the citations for the tools used to produce the datasets in the history. */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The encoded database identifier of the History. */
+            path: {
+                history_id: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": Record<string, never>[];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
     history_contents_api_histories__history_id__contents_get: {
         /**
          * Returns the contents of the given history.
@@ -9481,64 +10180,7 @@ export interface operations {
             };
         };
     };
-    archive_api_histories__history_id__contents_archive__filename___format__get: {
-        /**
-         * Build and return a compressed archive of the selected history contents.
-         * @description Build and return a compressed archive of the selected history contents.
-         *
-         * **Note**: this is a volatile endpoint and settings and behavior may change.
-         */
-        parameters: {
-            /** @description Whether to return the archive and file paths only (as JSON) and not an actual archive file. */
-            /**
-             * @description Generally a property name to filter by followed by an (often optional) hyphen and operator string.
-             * @example create_time-gt
-             */
-            /**
-             * @description The value to filter by.
-             * @example 2015-01-29
-             */
-            /** @description Starts at the beginning skip the first ( offset - 1 ) items and begin returning at the Nth item */
-            /** @description The maximum number of items to return. */
-            /**
-             * @description String containing one of the valid ordering attributes followed (optionally) by '-asc' or '-dsc' for ascending and descending order respectively. Orders can be stacked as a comma-separated list of values.
-             * @example name-dsc,create_time
-             */
-            query?: {
-                dry_run?: boolean;
-                q?: string[];
-                qv?: string[];
-                offset?: number;
-                limit?: number;
-                order?: string;
-            };
-            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
-            header?: {
-                "run-as"?: string;
-            };
-            /** @description The ID of the History. */
-            path: {
-                history_id: string;
-                filename: string;
-                format: string;
-            };
-        };
-        responses: {
-            /** @description Successful Response */
-            200: {
-                content: {
-                    "application/json": Record<string, never>;
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    archive_api_histories__history_id__contents_archive__id__get: {
+    archive_api_histories__history_id__contents_archive_get: {
         /**
          * Build and return a compressed archive of the selected history contents.
          * @description Build and return a compressed archive of the selected history contents.
@@ -9600,6 +10242,63 @@ export interface operations {
             };
         };
     };
+    archive_api_histories__history_id__contents_archive__filename___format__get: {
+        /**
+         * Build and return a compressed archive of the selected history contents.
+         * @description Build and return a compressed archive of the selected history contents.
+         *
+         * **Note**: this is a volatile endpoint and settings and behavior may change.
+         */
+        parameters: {
+            /** @description Whether to return the archive and file paths only (as JSON) and not an actual archive file. */
+            /**
+             * @description Generally a property name to filter by followed by an (often optional) hyphen and operator string.
+             * @example create_time-gt
+             */
+            /**
+             * @description The value to filter by.
+             * @example 2015-01-29
+             */
+            /** @description Starts at the beginning skip the first ( offset - 1 ) items and begin returning at the Nth item */
+            /** @description The maximum number of items to return. */
+            /**
+             * @description String containing one of the valid ordering attributes followed (optionally) by '-asc' or '-dsc' for ascending and descending order respectively. Orders can be stacked as a comma-separated list of values.
+             * @example name-dsc,create_time
+             */
+            query?: {
+                dry_run?: boolean;
+                q?: string[];
+                qv?: string[];
+                offset?: number;
+                limit?: number;
+                order?: string;
+            };
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The ID of the History. */
+            path: {
+                history_id: string;
+                filename: string;
+                format: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": Record<string, never>;
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
     bulk_operation_api_histories__history_id__contents_bulk_put: {
         /**
          * Executes an operation on a set of items contained in the given History.
@@ -9677,42 +10376,6 @@ export interface operations {
             };
         };
     };
-    prepare_collection_download_api_histories__history_id__contents_dataset_collections__id__prepare_download_post: {
-        /**
-         * Prepare an short term storage object that the collection will be downloaded to.
-         * @description The history dataset collection will be written as a `zip` archive to the
-         * returned short term storage object. Progress tracking this file's creation
-         * can be tracked with the short_term_storage API.
-         */
-        parameters: {
-            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
-            header?: {
-                "run-as"?: string;
-            };
-            /** @description The ID of the History. */
-            /** @description The ID of the `HDCA` contained in the history. */
-            path: {
-                history_id: string;
-                id: string;
-            };
-        };
-        responses: {
-            /** @description Short term storage reference for async monitoring of this download. */
-            200: {
-                content: {
-                    "application/json": components["schemas"]["AsyncFile"];
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-            /** @description Required asynchronous tasks required for this operation not available. */
-            501: never;
-        };
-    };
     materialize_dataset_api_histories__history_id__contents_datasets__id__materialize_post: {
         /** Materialize a deferred dataset into real, usable dataset. */
         parameters: {
@@ -9787,84 +10450,6 @@ export interface operations {
             };
         };
     };
-    contents_near_api_histories__history_id__contents__direction___hid___limit__get: {
-        /**
-         * Get content items around a particular `HID`.
-         * @description .. warning:: For internal use to support the scroller functionality.
-         *
-         * This endpoint provides random access to a large history without having
-         * to know exactly how many pages are in the final query. Pick a target HID
-         * and filters, and the endpoint will get a maximum of `limit` history items "around" the `hid`.
-         *
-         * Additional counts are provided in the HTTP headers.
-         *
-         * The `direction` determines what items are selected:
-         *
-         * a) item counts:
-         *
-         *    - total matches-up:   hid < {hid}
-         *    - total matches-down: hid > {hid}
-         *    - total matches:      total matches-up + total matches-down + 1 (+1 for hid == {hid})
-         *    - displayed matches-up:   hid <= {hid} (hid == {hid} is included)
-         *    - displayed matches-down: hid > {hid}
-         *    - displayed matches:      displayed matches-up + displayed matches-down
-         *
-         * b) {limit} history items:
-         *
-         *    - if direction == "before": hid <= {hid}
-         *    - if direction == "after":  hid > {hid}
-         *    - if direction == "near":   "near" {hid}, so that
-         *      n. items before <= limit // 2,
-         *      n. items after <= limit // 2 + 1.
-         *
-         * .. note:: This endpoint uses slightly different filter params syntax. Instead of using `q`/`qv` parameters,
-         *     it uses the following syntax for query parameters::
-         *
-         *         ?[field]-[operator]=[value]
-         *
-         *     Example::
-         *
-         *         ?update_time-gt=2015-01-29
-         */
-        parameters: {
-            /** @description A timestamp in ISO format to check if the history has changed since this particular date/time. If it hasn't changed, no additional processing will be done and 204 status code will be returned. */
-            /** @description View to be passed to the serializer */
-            /** @description Comma-separated list of keys to be passed to the serializer */
-            query?: {
-                since?: string;
-                view?: string;
-                keys?: string;
-            };
-            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
-            header?: {
-                "run-as"?: string;
-            };
-            /** @description The ID of the History. */
-            /** @description The target `HID` to get content around it. */
-            /** @description Determines what items are selected before, after or near the target `hid`. */
-            /** @description The maximum number of content items to return above and below the target `HID`. */
-            path: {
-                history_id: string;
-                hid: number;
-                direction: components["schemas"]["DirectionOptions"];
-                limit: number;
-            };
-        };
-        responses: {
-            /** @description Successful Response */
-            200: {
-                content: {
-                    "application/json": components["schemas"]["HistoryContentsResult"];
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
     history_contents_display_api_histories__history_id__contents__history_content_id__display_get: {
         /**
          * Displays (preview) or downloads dataset content.
@@ -10682,6 +11267,220 @@ export interface operations {
             };
         };
     };
+    get_custom_builds_metadata_api_histories__history_id__custom_builds_metadata_get: {
+        /** Returns meta data for custom builds. */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The encoded database identifier of the History. */
+            path: {
+                history_id: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["CustomBuildsMetadataResponse"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    disable_link_access_api_histories__history_id__disable_link_access_put: {
+        /**
+         * Makes this item inaccessible by a URL link.
+         * @description Makes this item inaccessible by a URL link and return the current sharing status.
+         */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The encoded database identifier of the History. */
+            path: {
+                history_id: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["SharingStatus"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    enable_link_access_api_histories__history_id__enable_link_access_put: {
+        /**
+         * Makes this item accessible by a URL link.
+         * @description Makes this item accessible by a URL link and return the current sharing status.
+         */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The encoded database identifier of the History. */
+            path: {
+                history_id: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["SharingStatus"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    get_history_exports_api_histories__history_id__exports_get: {
+        /**
+         * Get previous history exports.
+         * @description By default the legacy job-based history exports (jeha) are returned.
+         *
+         * Change the `accept` content type header to return the new task-based history exports.
+         */
+        parameters: {
+            /** @description The maximum number of items to return. */
+            /** @description Starts at the beginning skip the first ( offset - 1 ) items and begin returning at the Nth item */
+            query?: {
+                limit?: number;
+                offset?: number;
+            };
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The encoded database identifier of the History. */
+            path: {
+                history_id: string;
+            };
+        };
+        responses: {
+            /** @description A list of history exports */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["JobExportHistoryArchiveListResponse"];
+                    "application/vnd.galaxy.task.export+json": components["schemas"]["ExportTaskListResponse"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    archive_export_api_histories__history_id__exports_put: {
+        /**
+         * Start job (if needed) to create history export for corresponding history.
+         * @deprecated
+         * @description This will start a job to create a history export archive.
+         *
+         * Calling this endpoint multiple times will return the 202 status code until the archive
+         * has been completely generated and is ready to download. When ready, it will return
+         * the 200 status code along with the download link information.
+         *
+         * If the history will be exported to a `directory_uri`, instead of returning the download
+         * link information, the Job ID will be returned so it can be queried to determine when
+         * the file has been written.
+         *
+         * **Deprecation notice**: Please use `/api/histories/{id}/prepare_store_download` or
+         * `/api/histories/{id}/write_store` instead.
+         */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The encoded database identifier of the History. */
+            path: {
+                history_id: string;
+            };
+        };
+        requestBody?: {
+            content: {
+                "application/json": components["schemas"]["ExportHistoryArchivePayload"];
+            };
+        };
+        responses: {
+            /** @description Object containing url to fetch export from. */
+            200: {
+                content: {
+                    "application/json":
+                        | components["schemas"]["JobExportHistoryArchiveModel"]
+                        | components["schemas"]["JobIdResponse"];
+                };
+            };
+            /** @description The exported archive file is not ready yet. */
+            202: never;
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    history_archive_download_api_histories__history_id__exports__jeha_id__get: {
+        /**
+         * If ready and available, return raw contents of exported history as a downloadable archive.
+         * @deprecated
+         * @description See ``PUT /api/histories/{id}/exports`` to initiate the creation
+         * of the history export - when ready, that route will return 200 status
+         * code (instead of 202) and this route can be used to download the archive.
+         *
+         * **Deprecation notice**: Please use `/api/histories/{id}/prepare_store_download` or
+         * `/api/histories/{id}/write_store` instead.
+         */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The encoded database identifier of the History. */
+            /**
+             * @description The ID of the specific Job Export History Association or `latest` (default) to download the last generated archive.
+             * @example latest
+             */
+            path: {
+                history_id: string;
+                jeha_id: string | "latest";
+            };
+        };
+        responses: {
+            /** @description The archive file containing the History. */
+            200: never;
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
     index_jobs_summary_api_histories__history_id__jobs_summary_get: {
         /**
          * Return job state summary info for jobs, implicit groups jobs for collections or workflow invocations.
@@ -10759,350 +11558,7 @@ export interface operations {
             };
         };
     };
-    history_api_histories__id__get: {
-        /** Returns the history with the given ID. */
-        parameters: {
-            /** @description View to be passed to the serializer */
-            /** @description Comma-separated list of keys to be passed to the serializer */
-            query?: {
-                view?: string;
-                keys?: string;
-            };
-            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
-            header?: {
-                "run-as"?: string;
-            };
-            /** @description The encoded database identifier of the History. */
-            path: {
-                id: string;
-            };
-        };
-        responses: {
-            /** @description Successful Response */
-            200: {
-                content: {
-                    "application/json":
-                        | components["schemas"]["HistoryBeta"]
-                        | components["schemas"]["HistoryDetailed"]
-                        | components["schemas"]["HistorySummary"]
-                        | Record<string, never>;
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    update_api_histories__id__put: {
-        /** Updates the values for the history with the given ID. */
-        parameters: {
-            /** @description View to be passed to the serializer */
-            /** @description Comma-separated list of keys to be passed to the serializer */
-            query?: {
-                view?: string;
-                keys?: string;
-            };
-            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
-            header?: {
-                "run-as"?: string;
-            };
-            /** @description The encoded database identifier of the History. */
-            path: {
-                id: string;
-            };
-        };
-        requestBody: {
-            content: {
-                "application/json": Record<string, never>;
-            };
-        };
-        responses: {
-            /** @description Successful Response */
-            200: {
-                content: {
-                    "application/json":
-                        | components["schemas"]["HistoryBeta"]
-                        | components["schemas"]["HistoryDetailed"]
-                        | components["schemas"]["HistorySummary"]
-                        | Record<string, never>;
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    delete_api_histories__id__delete: {
-        /** Marks the history with the given ID as deleted. */
-        parameters: {
-            /** @description View to be passed to the serializer */
-            /** @description Comma-separated list of keys to be passed to the serializer */
-            query?: {
-                purge?: boolean;
-                view?: string;
-                keys?: string;
-            };
-            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
-            header?: {
-                "run-as"?: string;
-            };
-            /** @description The encoded database identifier of the History. */
-            path: {
-                id: string;
-            };
-        };
-        requestBody?: {
-            content: {
-                "application/json": components["schemas"]["DeleteHistoryPayload"];
-            };
-        };
-        responses: {
-            /** @description Successful Response */
-            200: {
-                content: {
-                    "application/json":
-                        | components["schemas"]["HistoryBeta"]
-                        | components["schemas"]["HistoryDetailed"]
-                        | components["schemas"]["HistorySummary"]
-                        | Record<string, never>;
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    citations_api_histories__id__citations_get: {
-        /** Return all the citations for the tools used to produce the datasets in the history. */
-        parameters: {
-            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
-            header?: {
-                "run-as"?: string;
-            };
-            /** @description The encoded database identifier of the History. */
-            path: {
-                id: string;
-            };
-        };
-        responses: {
-            /** @description Successful Response */
-            200: {
-                content: {
-                    "application/json": Record<string, never>[];
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    get_custom_builds_metadata_api_histories__id__custom_builds_metadata_get: {
-        /** Returns meta data for custom builds. */
-        parameters: {
-            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
-            header?: {
-                "run-as"?: string;
-            };
-            /** @description The encoded database identifier of the History. */
-            path: {
-                id: string;
-            };
-        };
-        responses: {
-            /** @description Successful Response */
-            200: {
-                content: {
-                    "application/json": components["schemas"]["CustomBuildsMetadataResponse"];
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    disable_link_access_api_histories__id__disable_link_access_put: {
-        /**
-         * Makes this item inaccessible by a URL link.
-         * @description Makes this item inaccessible by a URL link and return the current sharing status.
-         */
-        parameters: {
-            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
-            header?: {
-                "run-as"?: string;
-            };
-            /** @description The encoded database identifier of the History. */
-            path: {
-                id: string;
-            };
-        };
-        responses: {
-            /** @description Successful Response */
-            200: {
-                content: {
-                    "application/json": components["schemas"]["SharingStatus"];
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    enable_link_access_api_histories__id__enable_link_access_put: {
-        /**
-         * Makes this item accessible by a URL link.
-         * @description Makes this item accessible by a URL link and return the current sharing status.
-         */
-        parameters: {
-            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
-            header?: {
-                "run-as"?: string;
-            };
-            /** @description The encoded database identifier of the History. */
-            path: {
-                id: string;
-            };
-        };
-        responses: {
-            /** @description Successful Response */
-            200: {
-                content: {
-                    "application/json": components["schemas"]["SharingStatus"];
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    index_exports_api_histories__id__exports_get: {
-        /** Get previous history exports (to links). Effectively returns serialized JEHA objects. */
-        parameters: {
-            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
-            header?: {
-                "run-as"?: string;
-            };
-            /** @description The encoded database identifier of the History. */
-            path: {
-                id: string;
-            };
-        };
-        responses: {
-            /** @description Successful Response */
-            200: {
-                content: {
-                    "application/json": components["schemas"]["JobExportHistoryArchiveCollection"];
-                };
-            };
-            /** @description Validation Error */
-            422: {
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    archive_export_api_histories__id__exports_put: {
-        /**
-         * Start job (if needed) to create history export for corresponding history.
-         * @description This will start a job to create a history export archive.
-         *
-         * Calling this endpoint multiple times will return the 202 status code until the archive
-         * has been completely generated and is ready to download. When ready, it will return
-         * the 200 status code along with the download link information.
-         *
-         * If the history will be exported to a `directory_uri`, instead of returning the download
-         * link information, the Job ID will be returned so it can be queried to determine when
-         * the file has been written.
-         */
-        parameters: {
-            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
-            header?: {
-                "run-as"?: string;
-            };
-            /** @description The encoded database identifier of the History. */
-            path: {
-                id: string;
-            };
-        };
-        requestBody?: {
-            content: {
-                "application/json": components["schemas"]["ExportHistoryArchivePayload"];
-            };
-        };
-        responses: {
-            /** @description Object containing url to fetch export from. */
-            200: {
-                content: {
-                    "application/json":
-                        | components["schemas"]["JobExportHistoryArchiveModel"]
-                        | components["schemas"]["JobIdResponse"];
-                };
-            };
-            /** @description The exported archive file is not ready yet. */
-            202: never;
-            /** @description Validation Error */
-            422: {
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    history_archive_download_api_histories__id__exports__jeha_id__get: {
-        /**
-         * If ready and available, return raw contents of exported history as a downloadable archive.
-         * @description See ``PUT /api/histories/{id}/exports`` to initiate the creation
-         * of the history export - when ready, that route will return 200 status
-         * code (instead of 202) and this route can be used to download the archive.
-         */
-        parameters: {
-            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
-            header?: {
-                "run-as"?: string;
-            };
-            /** @description The encoded database identifier of the History. */
-            /**
-             * @description The ID of the specific Job Export History Association or `latest` (default) to download the last generated archive.
-             * @example latest
-             */
-            path: {
-                id: string;
-                jeha_id: string | "latest";
-            };
-        };
-        responses: {
-            /** @description The archive file containing the History. */
-            200: never;
-            /** @description Validation Error */
-            422: {
-                content: {
-                    "application/json": components["schemas"]["HTTPValidationError"];
-                };
-            };
-        };
-    };
-    prepare_store_download_api_histories__id__prepare_store_download_post: {
+    prepare_store_download_api_histories__history_id__prepare_store_download_post: {
         /** Return a short term storage token to monitor download of the history. */
         parameters: {
             /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
@@ -11111,7 +11567,7 @@ export interface operations {
             };
             /** @description The encoded database identifier of the History. */
             path: {
-                id: string;
+                history_id: string;
             };
         };
         requestBody: {
@@ -11134,7 +11590,7 @@ export interface operations {
             };
         };
     };
-    publish_api_histories__id__publish_put: {
+    publish_api_histories__history_id__publish_put: {
         /**
          * Makes this item public and accessible by a URL link.
          * @description Makes this item publicly available by a URL link and return the current sharing status.
@@ -11146,7 +11602,7 @@ export interface operations {
             };
             /** @description The encoded database identifier of the History. */
             path: {
-                id: string;
+                history_id: string;
             };
         };
         responses: {
@@ -11164,7 +11620,7 @@ export interface operations {
             };
         };
     };
-    share_with_users_api_histories__id__share_with_users_put: {
+    share_with_users_api_histories__history_id__share_with_users_put: {
         /**
          * Share this item with specific users.
          * @description Shares this item with specific users and return the current sharing status.
@@ -11176,7 +11632,7 @@ export interface operations {
             };
             /** @description The encoded database identifier of the History. */
             path: {
-                id: string;
+                history_id: string;
             };
         };
         requestBody: {
@@ -11199,7 +11655,7 @@ export interface operations {
             };
         };
     };
-    sharing_api_histories__id__sharing_get: {
+    sharing_api_histories__history_id__sharing_get: {
         /**
          * Get the current sharing status of the given item.
          * @description Return the sharing status of the item.
@@ -11211,7 +11667,7 @@ export interface operations {
             };
             /** @description The encoded database identifier of the History. */
             path: {
-                id: string;
+                history_id: string;
             };
         };
         responses: {
@@ -11229,7 +11685,7 @@ export interface operations {
             };
         };
     };
-    set_slug_api_histories__id__slug_put: {
+    set_slug_api_histories__history_id__slug_put: {
         /**
          * Set a new slug for this shared item.
          * @description Sets a new slug to access this item by URL. The new slug must be unique.
@@ -11241,7 +11697,7 @@ export interface operations {
             };
             /** @description The encoded database identifier of the History. */
             path: {
-                id: string;
+                history_id: string;
             };
         };
         requestBody: {
@@ -11260,7 +11716,7 @@ export interface operations {
             };
         };
     };
-    unpublish_api_histories__id__unpublish_put: {
+    unpublish_api_histories__history_id__unpublish_put: {
         /**
          * Removes this item from the published list.
          * @description Removes this item from the published list and return the current sharing status.
@@ -11272,7 +11728,7 @@ export interface operations {
             };
             /** @description The encoded database identifier of the History. */
             path: {
-                id: string;
+                history_id: string;
             };
         };
         responses: {
@@ -11290,7 +11746,7 @@ export interface operations {
             };
         };
     };
-    write_store_api_histories__id__write_store_post: {
+    write_store_api_histories__history_id__write_store_post: {
         /** Prepare history for export-style download and write to supplied URI. */
         parameters: {
             /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
@@ -11299,7 +11755,7 @@ export interface operations {
             };
             /** @description The encoded database identifier of the History. */
             path: {
-                id: string;
+                history_id: string;
             };
         };
         requestBody: {
@@ -11563,7 +12019,7 @@ export interface operations {
              * generally a partial match will be used to filter the query (i.e. in terms of the implementation
              * this means the database operation `ILIKE` will typically be used).
              *
-             * Once the tagged filters are extracted from the search query, the remaing text is just
+             * Once the tagged filters are extracted from the search query, the remaining text is just
              * used to search various documented attributes of the object.
              *
              * ## GitHub-style Tags Available
@@ -12958,6 +13414,34 @@ export interface operations {
             };
         };
     };
+    create_api_tool_data_post: {
+        /** Import a data manager bundle */
+        parameters?: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+        };
+        requestBody: {
+            content: {
+                "application/json": components["schemas"]["ImportToolDataBundle"];
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["AsyncTaskResultSummary"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
     show_api_tool_data__table_name__get: {
         /**
          * Get details of a given data table
@@ -13713,7 +14197,7 @@ export interface operations {
              * generally a partial match will be used to filter the query (i.e. in terms of the implementation
              * this means the database operation `ILIKE` will typically be used).
              *
-             * Once the tagged filters are extracted from the search query, the remaing text is just
+             * Once the tagged filters are extracted from the search query, the remaining text is just
              * used to search various documented attributes of the object.
              *
              * ## GitHub-style Tags Available
@@ -13772,6 +14256,39 @@ export interface operations {
             };
         };
     };
+    get_workflow_menu_api_workflows_menu_get: {
+        /** Get workflows present in the tools panel. */
+        parameters?: {
+            /** @description Whether to restrict result to deleted workflows. */
+            /** @description Whether to restrict result to hidden workflows. */
+            /** @description Whether to include a list of missing tools per workflow entry */
+            query?: {
+                show_deleted?: boolean;
+                show_hidden?: boolean;
+                missing_tools?: boolean;
+                show_published?: boolean;
+                show_shared?: boolean;
+            };
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": Record<string, never>;
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
     disable_link_access_api_workflows__id__disable_link_access_put: {
         /**
          * Makes this item inaccessible by a URL link.
@@ -14042,4 +14559,157 @@ export interface operations {
             };
         };
     };
+    show_versions_api_workflows__workflow_id__versions_get: {
+        /** List all versions of a workflow. */
+        parameters: {
+            query?: {
+                instance?: boolean;
+            };
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The encoded database identifier of the Stored Workflow. */
+            path: {
+                workflow_id: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": Record<string, never>;
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    get_object_ga4gh_drs_v1_objects__object_id__get: {
+        /** Get Object */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The ID of the group */
+            path: {
+                object_id: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["Model"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    get_object_ga4gh_drs_v1_objects__object_id__post: {
+        /** Get Object */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The ID of the group */
+            path: {
+                object_id: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["Model"];
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    get_access_url_ga4gh_drs_v1_objects__object_id__access__access_id__get: {
+        /** Get Access Url */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The ID of the group */
+            /** @description The access ID of the access method for objects, unused in Galaxy. */
+            path: {
+                object_id: string;
+                access_id: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": Record<string, never>;
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    get_access_url_ga4gh_drs_v1_objects__object_id__access__access_id__post: {
+        /** Get Access Url */
+        parameters: {
+            /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+            header?: {
+                "run-as"?: string;
+            };
+            /** @description The ID of the group */
+            /** @description The access ID of the access method for objects, unused in Galaxy. */
+            path: {
+                object_id: string;
+                access_id: string;
+            };
+        };
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": Record<string, never>;
+                };
+            };
+            /** @description Validation Error */
+            422: {
+                content: {
+                    "application/json": components["schemas"]["HTTPValidationError"];
+                };
+            };
+        };
+    };
+    service_info_ga4gh_drs_v1_service_info_get: {
+        /** Service Info */
+        responses: {
+            /** @description Successful Response */
+            200: {
+                content: {
+                    "application/json": components["schemas"]["Service"];
+                };
+            };
+        };
+    };
 }
diff --git a/client/src/store/historyStore/historyItemsStore.js b/client/src/store/historyStore/historyItemsStore.js
deleted file mode 100644
index c2f7fac7da5..00000000000
--- a/client/src/store/historyStore/historyItemsStore.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Requests history items by reacting to changes of filter props passed
- * to the history items provider used in the history panel.
- */
-
-import { reverse } from "lodash";
-import { LastQueue } from "utils/promise-queue";
-import { urlData } from "utils/url";
-import { mergeArray } from "./model/utilities";
-import { getFilters, getQueryString, testFilters } from "utils/filterConversion";
-
-const limit = 100;
-const queue = new LastQueue();
-
-const state = {
-    items: {},
-    itemKey: "hid",
-    latestCreateTime: new Date(),
-    totalMatchesCount: undefined,
-    lastCheckedTime: new Date(),
-    isWatching: false,
-};
-
-const getters = {
-    getHistoryItems:
-        (state) =>
-        ({ historyId, filterText }) => {
-            const itemArray = state.items[historyId] || [];
-            const filters = getFilters(filterText);
-            const filtered = itemArray.filter((item) => {
-                if (!item) {
-                    return false;
-                }
-                if (!testFilters(filters, item)) {
-                    return false;
-                }
-                return true;
-            });
-            return reverse(filtered);
-        },
-    getLatestCreateTime: (state) => () => state.latestCreateTime,
-    getTotalMatchesCount: (state) => () => state.totalMatchesCount,
-    getLastCheckedTime: (state) => () => state.lastCheckedTime,
-    getWatchingVisibility: (state) => () => state.isWatching,
-};
-
-const actions = {
-    fetchHistoryItems: async ({ commit }, { historyId, filterText, offset }) => {
-        const queryString = getQueryString(filterText);
-        const params = `v=dev&order=hid&offset=${offset}&limit=${limit}`;
-        const url = `/api/histories/${historyId}/contents?${params}&${queryString}`;
-        const headers = { accept: "application/vnd.galaxy.history.contents.stats+json" };
-        await queue.enqueue(urlData, { url, headers }, historyId).then((data) => {
-            const stats = data.stats;
-            commit("saveQueryStats", { stats });
-            const payload = data.contents;
-            commit("saveHistoryItems", { historyId, payload });
-        });
-    },
-};
-
-const mutations = {
-    saveHistoryItems: (state, { historyId, payload }) => {
-        // merges incoming payload into existing state
-        mergeArray(historyId, payload, state.items, state.itemKey);
-
-        // keep track of latest create time for items
-        payload.forEach((item) => {
-            if (item.state == "ok") {
-                const itemCreateTime = new Date(item.create_time);
-                if (itemCreateTime > state.latestCreateTime) {
-                    state.latestCreateTime = itemCreateTime;
-                }
-            }
-        });
-    },
-    setLastCheckedTime: (state, { checkForUpdate }) => {
-        state.lastCheckedTime = checkForUpdate;
-    },
-    setWatchingVisibility: (state, { watchingVisibility }) => {
-        state.isWatching = watchingVisibility;
-    },
-    saveQueryStats: (state, { stats }) => {
-        state.totalMatchesCount = stats.total_matches;
-    },
-};
-
-export const historyItemsStore = {
-    state,
-    getters,
-    actions,
-    mutations,
-};
diff --git a/client/src/store/historyStore/index.js b/client/src/store/historyStore/index.js
index 735beb6366d..406c6a7bc69 100644
--- a/client/src/store/historyStore/index.js
+++ b/client/src/store/historyStore/index.js
@@ -1,4 +1,3 @@
 export { collectionElementsStore } from "./collectionElementsStore";
 export { datasetStore } from "./datasetStore";
-export { historyItemsStore } from "./historyItemsStore";
 export { historyStore } from "./historyStore";
diff --git a/client/src/store/historyStore/model/watchHistory.js b/client/src/store/historyStore/model/watchHistory.js
index 048547fcb19..72ef8d96e93 100644
--- a/client/src/store/historyStore/model/watchHistory.js
+++ b/client/src/store/historyStore/model/watchHistory.js
@@ -6,6 +6,7 @@
  */
 
 import defaultStore from "store/index";
+import { useHistoryItemsStore } from "stores/history/historyItemsStore";
 import { urlData } from "utils/url";
 import { loadSet } from "utils/setCache";
 import { getCurrentHistoryFromServer } from "./queries";
@@ -37,12 +38,13 @@ function setVisibilityThrottle() {
 }
 
 export async function watchHistoryOnce(store) {
+    const historyItemsStore = useHistoryItemsStore();
     // "Reset" watchTimeout so we don't queue up watchHistory calls in rewatchHistory.
     watchTimeout = null;
     // get current history
     const checkForUpdate = new Date();
     const history = await getCurrentHistoryFromServer(lastUpdateTime);
-    store.commit("setLastCheckedTime", { checkForUpdate });
+    historyItemsStore.setLastCheckedTime(checkForUpdate);
     if (!history || !history.id) {
         return;
     }
@@ -73,7 +75,7 @@ export async function watchHistoryOnce(store) {
         // pass changed items to attached stores
         store.commit("history/setHistory", history);
         store.commit("saveDatasets", { payload });
-        store.commit("saveHistoryItems", { historyId, payload });
+        historyItemsStore.saveHistoryItems(historyId, payload);
         store.commit("saveCollectionObjects", { payload });
         // trigger changes in legacy handler
         const Galaxy = getGalaxyInstance();
@@ -86,10 +88,11 @@ export async function watchHistoryOnce(store) {
 }
 
 export async function watchHistory(store = defaultStore) {
+    const historyItemsStore = useHistoryItemsStore();
     // Only set up visibility listeners once, whenever a watch is first started
     if (watchingVisibility === false) {
         watchingVisibility = true;
-        store.commit("setWatchingVisibility", { watchingVisibility });
+        historyItemsStore.setWatchingVisibility(watchingVisibility);
         document.addEventListener("visibilitychange", setVisibilityThrottle);
     }
     try {
@@ -98,7 +101,7 @@ export async function watchHistory(store = defaultStore) {
         // error alerting the user that watch history failed
         console.warn(error);
         watchingVisibility = false;
-        store.commit("setWatchingVisibility", { watchingVisibility });
+        historyItemsStore.setWatchingVisibility(watchingVisibility);
     } finally {
         watchTimeout = setTimeout(() => {
             watchHistory(store);
diff --git a/client/src/store/historyStore/model/watchHistory.test.js b/client/src/store/historyStore/model/watchHistory.test.js
index cac99f9d1a7..7502625dc21 100644
--- a/client/src/store/historyStore/model/watchHistory.test.js
+++ b/client/src/store/historyStore/model/watchHistory.test.js
@@ -4,22 +4,21 @@ import { watchHistoryOnce } from "./watchHistory";
 import { collectionElementsStore } from "store/historyStore/collectionElementsStore";
 import { datasetStore } from "store/historyStore/datasetStore";
 import { historyStore } from "store/historyStore/historyStore";
-import { historyItemsStore } from "store/historyStore/historyItemsStore";
+import { useHistoryItemsStore } from "stores/history/historyItemsStore";
+import { createPinia, mapState } from "pinia";
 import { mount, createLocalVue } from "@vue/test-utils";
 import Vuex from "vuex";
 
+const pinia = createPinia();
+
 const testApp = {
     template: `<div/>`,
     computed: {
+        ...mapState(useHistoryItemsStore, ["getHistoryItems"]),
         currentHistoryId() {
             return this.$store.getters["history/currentHistoryId"];
         },
     },
-    methods: {
-        getHistoryItems(filterObj) {
-            return this.$store.getters["getHistoryItems"](filterObj);
-        },
-    },
 };
 
 describe("watchHistory", () => {
@@ -54,6 +53,7 @@ describe("watchHistory", () => {
         axiosMock = new MockAdapter(axios);
         const localVue = createLocalVue();
         localVue.use(Vuex);
+        useHistoryItemsStore(pinia);
 
         wrapper = mount(testApp, {
             store: new Vuex.Store({
@@ -61,10 +61,10 @@ describe("watchHistory", () => {
                     collectionElements: collectionElementsStore,
                     dataset: datasetStore,
                     history: historyStore,
-                    historyItems: historyItemsStore,
                 },
             }),
             localVue,
+            pinia,
         });
     });
 
@@ -79,9 +79,9 @@ describe("watchHistory", () => {
             .onGet(/api\/histories\/history-id\/contents?.*/)
             .replyOnce(200, historyItems);
         await watchHistoryOnce(wrapper.vm.$store);
-        expect(wrapper.vm.getHistoryItems({ historyId: "history-id", filterText: "" }).length).toBe(2);
-        expect(wrapper.vm.getHistoryItems({ historyId: "history-id", filterText: "second" })[0].hid).toBe(2);
-        expect(wrapper.vm.getHistoryItems({ historyId: "history-id", filterText: "state:ok" })[0].hid).toBe(1);
+        expect(wrapper.vm.getHistoryItems("history-id", "").length).toBe(2);
+        expect(wrapper.vm.getHistoryItems("history-id", "second")[0].hid).toBe(2);
+        expect(wrapper.vm.getHistoryItems("history-id", "state:ok")[0].hid).toBe(1);
     });
 
     it("survives a failing request", async () => {
@@ -96,7 +96,7 @@ describe("watchHistory", () => {
 
         await watchHistoryOnce(wrapper.vm.$store);
         expect(wrapper.vm.currentHistoryId).toBe("history-id");
-        expect(wrapper.vm.getHistoryItems({ historyId: "history-id", filterText: "" }).length).toBe(2);
+        expect(wrapper.vm.getHistoryItems("history-id", "").length).toBe(2);
         try {
             await watchHistoryOnce(wrapper.vm.$store);
         } catch (error) {
@@ -123,6 +123,6 @@ describe("watchHistory", () => {
             ]);
         await watchHistoryOnce(wrapper.vm.$store);
         // We should have received the update and have 3 items in the history
-        expect(wrapper.vm.getHistoryItems({ historyId: "history-id", filterText: "" }).length).toBe(3);
+        expect(wrapper.vm.getHistoryItems("history-id", "").length).toBe(3);
     });
 });
diff --git a/client/src/store/index.js b/client/src/store/index.js
index b42ef7c98a5..dd33e13485e 100644
--- a/client/src/store/index.js
+++ b/client/src/store/index.js
@@ -15,7 +15,7 @@ import { tagStore } from "./tagStore";
 import { jobMetricsStore } from "./jobMetricsStore";
 import { jobDestinationParametersStore } from "./jobDestinationParametersStore";
 import { invocationStore } from "./invocationStore";
-import { collectionElementsStore, datasetStore, historyItemsStore, historyStore } from "./historyStore";
+import { collectionElementsStore, datasetStore, historyStore } from "./historyStore";
 import { userStore, userFlagsStore } from "./userStore";
 import { configStore } from "./configStore";
 import { toolStore } from "./toolStore";
@@ -66,7 +66,6 @@ export function createStore() {
             jobMetrics: jobMetricsStore,
             gridSearch: gridSearchStore,
             history: historyStore,
-            historyItems: historyItemsStore,
             panels: panelStore,
             tags: tagStore,
             tools: toolStore,
diff --git a/client/src/store/userStore/queries.js b/client/src/store/userStore/queries.js
index dc355a886f8..c5299c39b03 100644
--- a/client/src/store/userStore/queries.js
+++ b/client/src/store/userStore/queries.js
@@ -30,3 +30,13 @@ export async function removeFavoriteTool(userId, toolId) {
         rethrowSimple(e);
     }
 }
+
+export async function setCurrentTheme(userId, theme) {
+    const url = prependPath(`/api/users/${userId}/theme/${theme}`);
+    try {
+        const { data } = await axios.put(url, { theme: theme });
+        return data;
+    } catch (e) {
+        rethrowSimple(e);
+    }
+}
diff --git a/client/src/store/userStore/userStore.js b/client/src/store/userStore/userStore.js
index fb00bf3f49b..0205779ebc1 100644
--- a/client/src/store/userStore/userStore.js
+++ b/client/src/store/userStore/userStore.js
@@ -1,8 +1,9 @@
-import { addFavoriteTool, removeFavoriteTool, getCurrentUser } from "./queries";
+import { addFavoriteTool, removeFavoriteTool, getCurrentUser, setCurrentTheme } from "./queries";
 import User from "./User";
 
 const state = {
     currentUser: null,
+    currentPreferences: null,
 };
 
 const getters = {
@@ -10,21 +11,40 @@ const getters = {
     // persist it easily in localStorage or something,
     // hydrate with model object using the getter
     currentUser(state) {
-        const userProps = state.currentUser || {};
+        const userProps = state.currentUser ?? {};
         const user = new User(userProps);
         return Object.freeze(user);
     },
+    currentTheme(state) {
+        return state.currentPreferences?.theme ?? null;
+    },
+    currentFavorites(state) {
+        const preferences = state.currentPreferences;
+        if (preferences && preferences.favorites) {
+            return JSON.parse(preferences.favorites);
+        } else {
+            return { tools: [] };
+        }
+    },
 };
 
 const mutations = {
     setCurrentUser(state, user) {
         state.currentUser = user;
+        state.currentPreferences = user?.preferences ?? null;
+    },
+    setCurrentTheme(state, theme) {
+        if (state.currentPreferences) {
+            state.currentPreferences.theme = theme;
+        }
     },
     setFavoriteTools(state, tools) {
-        const favoritesJson = state.currentUser.preferences.favorites;
-        const favorites = favoritesJson ? JSON.parse(favoritesJson) : { tools: [] };
-        favorites.tools = tools;
-        state.currentUser.preferences.favorites = JSON.stringify(favorites);
+        if (state.currentPreferences) {
+            const favorites = state.currentPreferences.favorites;
+            const favoritesDict = favorites ? JSON.parse(favorites) : { tools: [] };
+            favoritesDict.tools = tools;
+            state.currentPreferences.favorites = JSON.stringify(favoritesDict);
+        }
     },
 };
 
@@ -51,6 +71,10 @@ const actions = {
         dispatch("history/loadCurrentHistory", user, { root: true });
         dispatch("history/loadHistories", user, { root: true });
     },
+    async setCurrentTheme({ commit, state }, theme) {
+        const currentTheme = await setCurrentTheme(state.currentUser.id, theme);
+        commit("setCurrentTheme", currentTheme);
+    },
     async addFavoriteTool({ commit, state }, toolId) {
         const tools = await addFavoriteTool(state.currentUser.id, toolId);
         commit("setFavoriteTools", tools);
diff --git a/client/src/stores/datatypesMapperStore.ts b/client/src/stores/datatypesMapperStore.ts
new file mode 100644
index 00000000000..9b6adb2d5ed
--- /dev/null
+++ b/client/src/stores/datatypesMapperStore.ts
@@ -0,0 +1,31 @@
+import { getDatatypesMapper } from "@/components/Datatypes";
+import type { DatatypesMapperModel } from "@/components/Datatypes/model";
+
+import { defineStore } from "pinia";
+import { rethrowSimple } from "@/utils/simple-error";
+
+interface State {
+    datatypesMapper: DatatypesMapperModel | null;
+    loading: boolean;
+}
+
+export const useDatatypesMapperStore = defineStore("datatypesMapperStore", {
+    state: (): State => ({
+        datatypesMapper: null,
+        loading: false,
+    }),
+    actions: {
+        async createMapper(this: State) {
+            if (!this.loading && !this.datatypesMapper) {
+                this.loading = true;
+                try {
+                    this.datatypesMapper = await getDatatypesMapper(false);
+                    this.loading = false;
+                } catch (error) {
+                    this.loading = false;
+                    rethrowSimple(error);
+                }
+            }
+        },
+    },
+});
diff --git a/client/src/stores/entryPointStore.js b/client/src/stores/entryPointStore.js
new file mode 100644
index 00000000000..272906ee7b1
--- /dev/null
+++ b/client/src/stores/entryPointStore.js
@@ -0,0 +1,74 @@
+import { defineStore } from "pinia";
+import { getAppRoot } from "onload/loadConfig";
+import { rethrowSimple } from "utils/simple-error";
+import axios from "axios";
+import isEqual from "lodash.isequal";
+
+export const useEntryPointStore = defineStore("entryPointStore", {
+    state: () => ({
+        entryPoints: [],
+        pollTimeout: undefined,
+    }),
+    getters: {
+        entryPointsForJob: (state) => {
+            return (jobId) => state.entryPoints.filter((entryPoint) => entryPoint["job_id"] === jobId);
+        },
+        entryPointsForHda: (state) => {
+            return (hdaId) =>
+                state.entryPoints.filter((entryPoint) => entryPoint["output_datasets_ids"].includes(hdaId));
+        },
+    },
+    actions: {
+        async ensurePollingEntryPoints() {
+            await this.fetchEntryPoints();
+            this.pollTimeout = setTimeout(() => {
+                this.ensurePollingEntryPoints();
+            }, 10000);
+        },
+        stopPollingEntryPoints() {
+            this.pollTimeout = clearTimeout(this.pollTimeout);
+        },
+        async fetchEntryPoints() {
+            this.stopPollingEntryPoints();
+            const url = getAppRoot() + `api/entry_points`;
+            const params = { running: true };
+            axios
+                .get(url, { params: params })
+                .then((response) => {
+                    this.updateEntryPoints(response.data);
+                })
+                .catch((e) => {
+                    rethrowSimple(e);
+                });
+        },
+        updateEntryPoints(data) {
+            let hasChanged = this.entryPoints.length !== data.length ? true : false;
+            if (this.entryPoints.length === 0) {
+                this.entryPoints = data;
+            } else {
+                const newEntryPoints = [];
+                for (const ep of data) {
+                    const olderEntryPoint = this.entryPoints.filter((item) => item.id === ep.id)[0];
+                    if (!hasChanged && !isEqual(olderEntryPoint, ep)) {
+                        hasChanged = true;
+                    }
+                    newEntryPoints.push(mergeEntryPoints(olderEntryPoint, ep));
+                }
+                if (hasChanged) {
+                    this.entryPoints = newEntryPoints;
+                }
+            }
+            function mergeEntryPoints(original, updated) {
+                return { ...original, ...updated };
+            }
+        },
+        removeEntryPoint(toolId) {
+            const index = this.entryPoints.findIndex((ep) => {
+                return ep.id === toolId ? true : false;
+            });
+            if (index >= 0) {
+                this.entryPoints.splice(index, 1);
+            }
+        },
+    },
+});
diff --git a/client/src/stores/entryPointStore.test.js b/client/src/stores/entryPointStore.test.js
new file mode 100644
index 00000000000..fe00fb75bec
--- /dev/null
+++ b/client/src/stores/entryPointStore.test.js
@@ -0,0 +1,71 @@
+import { setActivePinia, createPinia } from "pinia";
+import { useEntryPointStore } from "./entryPointStore";
+import flushPromises from "flush-promises";
+import testInteractiveToolsResponse from "../components/InteractiveTools/testData/testInteractiveToolsResponse";
+import MockAdapter from "axios-mock-adapter";
+import axios from "axios";
+
+describe("stores/EntryPointStore", () => {
+    let axiosMock;
+    let store;
+
+    beforeEach(async () => {
+        axiosMock = new MockAdapter(axios);
+        setActivePinia(createPinia());
+        axiosMock.onGet("/api/entry_points", { params: { running: true } }).reply(200, testInteractiveToolsResponse);
+        store = useEntryPointStore();
+        store.ensurePollingEntryPoints();
+        await flushPromises();
+    });
+
+    afterEach(() => {
+        axiosMock.restore();
+    });
+
+    it("polls", async () => {
+        expect(store.entryPoints.length).toBe(2);
+    });
+    it("stops polling", async () => {
+        expect(store.pollTimeout >= 0).toBeTruthy();
+        store.stopPollingEntryPoints();
+        expect(store.pollTimeout === undefined).toBeTruthy();
+    });
+    it("performs a partial update", async () => {
+        store.stopPollingEntryPoints();
+        const updateData = [
+            {
+                model_class: "InteractiveToolEntryPoint",
+                id: "b887d74393f85b6d",
+                job_id: "52e496b945151ee8",
+                name: "Oh there you go, bringing class into it again.",
+                created_time: "2020-01-24T15:59:22.406480",
+                modified_time: "2020-02-24T15:59:24.757453",
+                output_datasets_ids: ["4e9e0c7225b0bb81"],
+                target: "http://b887d74393f85b6d-b1fd3f42331a49c1b3d8a4d1b27240b8.interactivetoolentrypoint.interactivetool.localhost:8080/loginapikey/oleg",
+            },
+        ];
+        store.updateEntryPoints(updateData);
+        expect(store.entryPoints.length).toBe(1);
+        expect(store.entryPoints[0].name === "Oh there you go, bringing class into it again.").toBeTruthy();
+        expect(store.entryPoints[0].active).toBeTruthy();
+    });
+    it("removes an entry point of given id", async () => {
+        let entryPointForId = store.entryPoints.filter((item) => item.id === "52e496b945151ee8");
+        expect(entryPointForId.length).toBe(1);
+        store.removeEntryPoint("52e496b945151ee8");
+        entryPointForId = store.entryPoints.filter((item) => item.id === "52e496b945151ee8");
+        expect(entryPointForId.length).toBe(0);
+    });
+    it("retrieves entry point for a given job", async () => {
+        const entryPointForJob = store.entryPointsForJob("6fc9fbb81c497f69");
+        expect(entryPointForJob.length).toBe(1);
+        expect(entryPointForJob[0].id === "52e496b945151ee8").toBeTruthy();
+        expect(entryPointForJob[0].active).toBeTruthy();
+    });
+    it("retrieves entry points for a given hda", async () => {
+        const entryPointForHda = store.entryPointsForHda("4e9e0c7225b0bb81");
+        expect(entryPointForHda.length).toBe(1);
+        expect(entryPointForHda[0].id === "52e496b945151ee8").toBeTruthy();
+        expect(entryPointForHda[0].active).toBeTruthy();
+    });
+});
diff --git a/client/src/stores/history/historyItemsStore.js b/client/src/stores/history/historyItemsStore.js
new file mode 100644
index 00000000000..7a0563dc297
--- /dev/null
+++ b/client/src/stores/history/historyItemsStore.js
@@ -0,0 +1,103 @@
+/**
+ * Requests history items by reacting to changes of filter props passed
+ * to the history items provider used in the history panel.
+ */
+
+import { defineStore } from "pinia";
+import Vue from "vue";
+import { reverse } from "lodash";
+import { LastQueue } from "utils/promise-queue";
+import { urlData } from "utils/url";
+import { mergeArray } from "store/historyStore/model/utilities";
+import { HistoryFilters } from "components/History/HistoryFilters";
+
+const limit = 100;
+const queue = new LastQueue();
+
+export const useHistoryItemsStore = defineStore("historyItemsStore", {
+    state: () => ({
+        items: {},
+        itemKey: "hid",
+        latestCreateTime: new Date(),
+        totalMatchesCount: undefined,
+        lastCheckedTime: new Date(),
+        relatedItems: {},
+        isWatching: false,
+    }),
+    getters: {
+        getHistoryItems: (state) => {
+            return (historyId, filterText) => {
+                const itemArray = state.items[historyId] || [];
+                const filters = HistoryFilters.getFilters(filterText).filter((filter) => !filter.includes("related"));
+                const relatedHid = HistoryFilters.getFilterValue(filterText, "related");
+                const filtered = itemArray.filter((item) => {
+                    if (!item) {
+                        return false;
+                    }
+                    if (!HistoryFilters.testFilters(filters, item)) {
+                        return false;
+                    }
+                    const relationKey = `${historyId}-${relatedHid}-${item.hid}`;
+                    if (relatedHid && !state.relatedItems[relationKey]) {
+                        return false;
+                    }
+                    return true;
+                });
+                return reverse(filtered);
+            };
+        },
+        getLatestCreateTime: (state) => {
+            return state.latestCreateTime;
+        },
+        getTotalMatchesCount: (state) => {
+            return state.totalMatchesCount;
+        },
+        getLastCheckedTime: (state) => {
+            return state.lastCheckedTime;
+        },
+        getWatchingVisibility: (state) => {
+            return state.isWatching;
+        },
+    },
+    actions: {
+        async fetchHistoryItems(historyId, filterText, offset) {
+            const queryString = HistoryFilters.getQueryString(filterText);
+            const params = `v=dev&order=hid&offset=${offset}&limit=${limit}`;
+            const url = `/api/histories/${historyId}/contents?${params}&${queryString}`;
+            const headers = { accept: "application/vnd.galaxy.history.contents.stats+json" };
+            await queue.enqueue(urlData, { url, headers }, historyId).then((data) => {
+                const stats = data.stats;
+                this.totalMatchesCount = stats.total_matches;
+                const payload = data.contents;
+                const relatedHid = HistoryFilters.getFilterValue(filterText, "related");
+                this.saveHistoryItems(historyId, payload, relatedHid);
+            });
+        },
+        // Setters
+        saveHistoryItems(historyId, payload, relatedHid = null) {
+            this.$patch((state) => {
+                // merges incoming payload into existing state
+                mergeArray(historyId, payload, state.items, state.itemKey);
+                // keep track of latest create time for items
+                payload.forEach((item) => {
+                    if (item.state == "ok") {
+                        const itemCreateTime = new Date(item.create_time);
+                        if (itemCreateTime > state.latestCreateTime) {
+                            state.latestCreateTime = itemCreateTime;
+                        }
+                    }
+                    if (relatedHid) {
+                        const relationKey = `${historyId}-${relatedHid}-${item.hid}`;
+                        Vue.set(state.relatedItems, relationKey, true);
+                    }
+                });
+            });
+        },
+        setLastCheckedTime(checkForUpdate) {
+            this.lastCheckedTime = checkForUpdate;
+        },
+        setWatchingVisibility(watchingVisibility) {
+            this.isWatching = watchingVisibility;
+        },
+    },
+});
diff --git a/client/src/stores/workflowConnectionStore.test.ts b/client/src/stores/workflowConnectionStore.test.ts
new file mode 100644
index 00000000000..ff15ac9d159
--- /dev/null
+++ b/client/src/stores/workflowConnectionStore.test.ts
@@ -0,0 +1,80 @@
+import { setActivePinia, createPinia } from "pinia";
+
+import { useConnectionStore, getTerminalId } from "@/stores/workflowConnectionStore";
+import { useWorkflowStepStore } from "@/stores/workflowStepStore";
+import type { Connection, InputTerminal, OutputTerminal } from "@/stores/workflowConnectionStore";
+import type { NewStep } from "@/stores/workflowStepStore";
+
+const workflowStepZero: NewStep = {
+    input_connections: {},
+    inputs: [],
+    name: "a step",
+    outputs: [],
+    post_job_actions: {},
+    tool_state: {},
+    type: "tool",
+    workflow_outputs: [],
+};
+
+const workflowStepOne: NewStep = { ...workflowStepZero };
+
+const inputTerminal: InputTerminal = {
+    stepId: 1,
+    name: "input_name",
+    connectorType: "input",
+};
+
+const outputTerminal: OutputTerminal = {
+    stepId: 0,
+    name: "output_name",
+    connectorType: "output",
+};
+
+const connection: Connection = {
+    id: "connection-id",
+    input: inputTerminal,
+    output: outputTerminal,
+};
+
+describe("Connection Store", () => {
+    beforeEach(() => {
+        setActivePinia(createPinia());
+        const workflowStepStore = useWorkflowStepStore();
+        workflowStepStore.addStep(workflowStepZero);
+        workflowStepStore.addStep(workflowStepOne);
+    });
+
+    it("adds connection", () => {
+        const connectionStore = useConnectionStore();
+        expect(connectionStore.connections.length).toBe(0);
+        connectionStore.addConnection(connection);
+        expect(connectionStore.connections.length).toBe(1);
+    });
+    it("removes connection", () => {
+        const connectionStore = useConnectionStore();
+        connectionStore.addConnection(connection);
+        connectionStore.removeConnection(inputTerminal);
+        expect(connectionStore.connections.length).toBe(0);
+    });
+    it("finds connections for steps", () => {
+        const connectionStore = useConnectionStore();
+        expect(connectionStore.getConnectionsForStep(0)).toStrictEqual([]);
+        expect(connectionStore.getConnectionsForStep(1)).toStrictEqual([]);
+        connectionStore.addConnection(connection);
+        expect(connectionStore.getConnectionsForStep(0)).toStrictEqual([connection]);
+        expect(connectionStore.getConnectionsForStep(1)).toStrictEqual([connection]);
+        connectionStore.removeConnection(connection.input);
+        expect(connectionStore.getConnectionsForStep(0)).toStrictEqual([]);
+        expect(connectionStore.getConnectionsForStep(1)).toStrictEqual([]);
+    });
+    it("finds output terminals for input terminal", () => {
+        const connectionStore = useConnectionStore();
+        expect(connectionStore.getOutputTerminalsForInputTerminal(getTerminalId(connection.input))).toStrictEqual([]);
+        connectionStore.addConnection(connection);
+        expect(connectionStore.getOutputTerminalsForInputTerminal(getTerminalId(connection.input))).toStrictEqual([
+            connection.output,
+        ]);
+        connectionStore.removeConnection(connection.input);
+        expect(connectionStore.getOutputTerminalsForInputTerminal(getTerminalId(connection.input))).toStrictEqual([]);
+    });
+});
diff --git a/client/src/stores/workflowConnectionStore.ts b/client/src/stores/workflowConnectionStore.ts
new file mode 100644
index 00000000000..45f08a05653
--- /dev/null
+++ b/client/src/stores/workflowConnectionStore.ts
@@ -0,0 +1,154 @@
+import { defineStore } from "pinia";
+import { useWorkflowStepStore } from "@/stores/workflowStepStore";
+
+export interface State {
+    connections: Connection[];
+}
+
+export class Connection {
+    input: InputTerminal;
+    output: OutputTerminal;
+
+    constructor(input: InputTerminal, output: OutputTerminal) {
+        this.input = input;
+        this.output = output;
+    }
+
+    get id(): string {
+        return `${this.input.stepId}-${this.input.name}-${this.output.stepId}-${this.output.name}`;
+    }
+}
+
+export interface BaseTerminal {
+    stepId: number;
+    name: string;
+    connectorType?: "input" | "output";
+}
+
+export interface InputTerminal extends BaseTerminal {
+    connectorType: "input";
+}
+
+export interface OutputTerminal extends BaseTerminal {
+    connectorType: "output";
+}
+
+interface TerminalToOutputTerminals {
+    [index: string]: OutputTerminal[];
+}
+
+interface TerminalToInputTerminals {
+    [index: string]: InputTerminal[];
+}
+
+export const useConnectionStore = defineStore("workflowConnectionStore", {
+    state: (): State => ({
+        connections: [] as Connection[],
+    }),
+    getters: {
+        getOutputTerminalsForInputTerminal(state: State) {
+            const inputTerminalToOutputTerminals: TerminalToOutputTerminals = {};
+            state.connections.map((connection) => {
+                const terminals = getTerminals(connection);
+                const inputTerminalId = getTerminalId(terminals.input);
+                inputTerminalId in inputTerminalToOutputTerminals
+                    ? inputTerminalToOutputTerminals[inputTerminalId].push(terminals.output)
+                    : (inputTerminalToOutputTerminals[inputTerminalId] = [terminals.output]);
+            });
+            return (terminalId: string): OutputTerminal[] => {
+                return inputTerminalToOutputTerminals[terminalId] || [];
+            };
+        },
+        getInputTerminalsForOutputTerminal(state: State) {
+            const outputTerminalToInputTerminals: TerminalToInputTerminals = {};
+            state.connections.map((connection) => {
+                const terminals = getTerminals(connection);
+                const outputTerminalId = getTerminalId(terminals.output);
+                outputTerminalId in outputTerminalToInputTerminals
+                    ? outputTerminalToInputTerminals[outputTerminalId].push(terminals.input)
+                    : (outputTerminalToInputTerminals[outputTerminalId] = [terminals.input]);
+            });
+            return (terminalId: string): BaseTerminal[] => {
+                return outputTerminalToInputTerminals[terminalId] || [];
+            };
+        },
+        getConnectionsForTerminal(state: State) {
+            const terminalToConnection: { [index: string]: Connection[] } = {};
+            state.connections.map((connection) => {
+                const terminals = getTerminals(connection);
+                const outputTerminalId = getTerminalId(terminals.output);
+                if (outputTerminalId in terminalToConnection) {
+                    terminalToConnection[outputTerminalId].push(connection);
+                } else {
+                    terminalToConnection[outputTerminalId] = [connection];
+                }
+                const inputTerminalId = getTerminalId(terminals.input);
+                if (inputTerminalId in terminalToConnection) {
+                    terminalToConnection[inputTerminalId].push(connection);
+                } else {
+                    terminalToConnection[inputTerminalId] = [connection];
+                }
+            });
+            return (terminalId: string): Connection[] => {
+                return terminalToConnection[terminalId] || [];
+            };
+        },
+        getConnectionsForStep(state: State) {
+            const stepToConnections: { [index: number]: Connection[] } = {};
+            state.connections.map((connection) => {
+                connection.input.stepId in stepToConnections
+                    ? stepToConnections[connection.input.stepId].push(connection)
+                    : (stepToConnections[connection.input.stepId] = [connection]);
+                connection.output.stepId in stepToConnections
+                    ? stepToConnections[connection.output.stepId].push(connection)
+                    : (stepToConnections[connection.output.stepId] = [connection]);
+            });
+            return (stepId: number): Connection[] => stepToConnections[stepId] || [];
+        },
+    },
+    actions: {
+        addConnection(this: State, connection: Connection) {
+            this.connections.push(connection);
+            const stepStore = useWorkflowStepStore();
+            stepStore.addConnection(connection);
+        },
+        removeConnection(this: State, terminal: InputTerminal | OutputTerminal | Connection["id"]) {
+            const stepStore = useWorkflowStepStore();
+            this.connections = this.connections.filter((connection) => {
+                if (typeof terminal === "string") {
+                    if (connection.id == terminal) {
+                        stepStore.removeConnection(connection);
+                        return false;
+                    } else {
+                        return true;
+                    }
+                } else if (terminal.connectorType === "input") {
+                    if (connection.input.stepId == terminal.stepId && connection.input.name == terminal.name) {
+                        stepStore.removeConnection(connection);
+                        return false;
+                    } else {
+                        return true;
+                    }
+                } else {
+                    if (connection.output.stepId == terminal.stepId && connection.output.name == terminal.name) {
+                        stepStore.removeConnection(connection);
+                        return false;
+                    } else {
+                        return true;
+                    }
+                }
+            });
+        },
+    },
+});
+
+export function getTerminalId(item: BaseTerminal): string {
+    return `node-${item.stepId}-${item.connectorType}-${item.name}`;
+}
+
+export function getTerminals(item: Connection): { input: InputTerminal; output: OutputTerminal } {
+    return {
+        input: { stepId: item.input.stepId, name: item.input.name, connectorType: "input" },
+        output: { stepId: item.output.stepId, name: item.output.name, connectorType: "output" },
+    };
+}
diff --git a/client/src/stores/workflowEditorStateStore.ts b/client/src/stores/workflowEditorStateStore.ts
new file mode 100644
index 00000000000..8aa772193dd
--- /dev/null
+++ b/client/src/stores/workflowEditorStateStore.ts
@@ -0,0 +1,89 @@
+import Vue from "vue";
+import type { UnwrapRef } from "vue";
+import { defineStore } from "pinia";
+import type { OutputTerminals } from "@/components/Workflow/Editor/modules/terminals";
+import type { UseElementBoundingReturn } from "@vueuse/core";
+
+export interface TerminalPosition {
+    startX: number;
+    endX: number;
+    startY: number;
+    endY: number;
+}
+
+export interface XYPosition {
+    x: number;
+    y: number;
+}
+
+interface State {
+    inputTerminals: { [index: number]: { [index: string]: TerminalPosition } };
+    outputTerminals: { [index: number]: { [index: string]: TerminalPosition } };
+    draggingPosition: TerminalPosition | null;
+    draggingTerminal: OutputTerminals | null;
+    activeNodeId: number | null;
+    scale: number;
+    stepPosition: { [index: number]: UnwrapRef<UseElementBoundingReturn> };
+    stepLoadingState: { [index: number]: { loading?: boolean; error?: string } };
+}
+
+export const useWorkflowStateStore = defineStore("workflowStateStore", {
+    state: (): State => ({
+        inputTerminals: {},
+        outputTerminals: {},
+        draggingPosition: null,
+        draggingTerminal: null,
+        activeNodeId: null,
+        scale: 1,
+        stepPosition: {},
+        stepLoadingState: {},
+    }),
+    getters: {
+        getInputTerminalPosition(state: State) {
+            return (stepId: number, inputName: string) => state.inputTerminals[stepId]?.[inputName];
+        },
+        getOutputTerminalPosition(state: State) {
+            return (stepId: number, outputName: string) => state.outputTerminals[stepId]?.[outputName];
+        },
+        getStepLoadingState(state: State) {
+            return (stepId: number) => state.stepLoadingState[stepId];
+        },
+    },
+    actions: {
+        setInputTerminalPosition(stepId: number, inputName: string, position: TerminalPosition) {
+            if (!this.inputTerminals[stepId]) {
+                Vue.set(this.inputTerminals, stepId, { [inputName]: position });
+            } else {
+                Vue.set(this.inputTerminals[stepId], inputName, position);
+            }
+        },
+        setOutputTerminalPosition(stepId: number, outputName: string, position: TerminalPosition) {
+            if (!this.outputTerminals[stepId]) {
+                Vue.set(this.outputTerminals, stepId, { [outputName]: position });
+            } else {
+                Vue.set(this.outputTerminals[stepId], outputName, position);
+            }
+        },
+        deleteInputTerminalPosition(stepId: number, inputName: string) {
+            delete this.inputTerminals[stepId]?.[inputName];
+        },
+        deleteOutputTerminalPosition(stepId: number, outputName: string) {
+            delete this.outputTerminals[stepId]?.[outputName];
+        },
+        setActiveNode(nodeId: number | null) {
+            this.activeNodeId = nodeId;
+        },
+        setScale(scale: number) {
+            this.scale = scale;
+        },
+        setStepPosition(stepId: number, position: UnwrapRef<UseElementBoundingReturn>) {
+            Vue.set(this.stepPosition, stepId, position);
+        },
+        deleteStepPosition(stepId: number) {
+            delete this.stepPosition[stepId];
+        },
+        setLoadingState(stepId: number, loading: boolean, error: string | undefined) {
+            Vue.set(this.stepLoadingState, stepId, { loading, error });
+        },
+    },
+});
diff --git a/client/src/stores/workflowStepStore.test.ts b/client/src/stores/workflowStepStore.test.ts
new file mode 100644
index 00000000000..01a8810b5c9
--- /dev/null
+++ b/client/src/stores/workflowStepStore.test.ts
@@ -0,0 +1,62 @@
+import { setActivePinia, createPinia } from "pinia";
+
+import { useWorkflowStepStore } from "@/stores/workflowStepStore";
+import { useConnectionStore } from "./workflowConnectionStore";
+import type { NewStep, StepInputConnection } from "@/stores/workflowStepStore";
+
+const stepInputConnection: StepInputConnection = {
+    "1": {
+        output_name: "output",
+        id: 0,
+    },
+};
+
+const workflowStepZero: NewStep = {
+    input_connections: {},
+    inputs: [],
+    name: "a step",
+    outputs: [],
+    post_job_actions: {},
+    tool_state: {},
+    type: "tool",
+    workflow_outputs: [],
+};
+
+const workflowStepOne: NewStep = { ...workflowStepZero, input_connections: stepInputConnection };
+
+describe("Connection Store", () => {
+    beforeEach(() => {
+        setActivePinia(createPinia());
+    });
+
+    it("adds step", () => {
+        const stepStore = useWorkflowStepStore();
+        expect(stepStore.steps).toStrictEqual({});
+        stepStore.addStep(workflowStepZero);
+        expect(stepStore.getStep(0)).toBe(workflowStepZero);
+        expect(workflowStepZero.id).toBe(0);
+    });
+    it("removes step", () => {
+        const stepStore = useWorkflowStepStore();
+        const addedStep = stepStore.addStep(workflowStepZero);
+        expect(addedStep.id).toBe(0);
+        stepStore.removeStep(addedStep.id);
+        expect(stepStore.getStep(0)).toBe(undefined);
+    });
+    it("creates connection if step has connection", () => {
+        const stepStore = useWorkflowStepStore();
+        const connectionStore = useConnectionStore();
+        stepStore.addStep(workflowStepZero);
+        stepStore.addStep(workflowStepOne);
+        expect(connectionStore.connections.length).toBe(1);
+    });
+    it("removes connection if step has connection", () => {
+        const stepStore = useWorkflowStepStore();
+        const connectionStore = useConnectionStore();
+        stepStore.addStep(workflowStepZero);
+        const stepOne = stepStore.addStep(workflowStepOne);
+        expect(connectionStore.connections.length).toBe(1);
+        stepStore.removeStep(stepOne.id);
+        expect(connectionStore.connections.length).toBe(0);
+    });
+});
diff --git a/client/src/stores/workflowStepStore.ts b/client/src/stores/workflowStepStore.ts
new file mode 100644
index 00000000000..f183bd9606e
--- /dev/null
+++ b/client/src/stores/workflowStepStore.ts
@@ -0,0 +1,240 @@
+import Vue from "vue";
+import { defineStore } from "pinia";
+import { useConnectionStore } from "@/stores/workflowConnectionStore";
+import { Connection } from "@/stores/workflowConnectionStore";
+import type { CollectionTypeDescriptor } from "@/components/Workflow/Editor/modules/collectionTypeDescription";
+
+interface State {
+    steps: { [index: string]: Step };
+    stepIndex: number;
+    stepMapOver: { [index: number]: CollectionTypeDescriptor };
+}
+
+interface StepPosition {
+    top: number;
+    left: number;
+}
+
+/*
+      "ChangeDatatypeActionout_file1": {
+        "action_type": "ChangeDatatypeAction",
+        "output_name": "out_file1",
+        "action_arguments": {
+          "newtype": "ab1"
+        }
+      }
+*/
+
+export interface PostJobAction {
+    action_type: string;
+    output_name: string;
+    action_arguments: {
+        [index: string]: string;
+    };
+}
+
+export interface PostJobActions {
+    [index: string]: PostJobAction;
+}
+
+export interface DataOutput {
+    extensions: string[];
+    name: string;
+    optional: boolean;
+}
+
+export interface CollectionOutput extends Omit<DataOutput, "type"> {
+    collection: boolean;
+    collection_type: string;
+    collection_type_source: string | null;
+}
+
+export declare const ParameterTypes: "text" | "integer" | "float" | "boolean" | "color";
+export interface ParameterOutput extends Omit<DataOutput, "type" | "extensions"> {
+    type: typeof ParameterTypes;
+    parameter: true;
+}
+
+interface BaseStepInput {
+    name: string;
+    label: string;
+    multiple: boolean;
+    extensions: string[];
+    optional: boolean;
+    input_type: string;
+}
+
+export interface DataStepInput extends BaseStepInput {
+    input_type: "dataset";
+}
+
+export interface DataCollectionStepInput extends BaseStepInput {
+    input_type: "dataset_collection";
+    collection_types: string[];
+}
+
+export interface ParameterStepInput extends Omit<BaseStepInput, "input_type"> {
+    input_type: "parameter";
+    type: typeof ParameterTypes;
+}
+
+type InputTerminalSource = DataStepInput | DataCollectionStepInput | ParameterStepInput;
+type OutputTerminalSource = DataOutput | CollectionOutput | ParameterOutput;
+export type TerminalSource = InputTerminalSource | OutputTerminalSource;
+
+interface WorkflowOutput {
+    output_name: string;
+    label?: string;
+    uuid?: string;
+}
+
+export interface NewStep {
+    annotation?: string;
+    config_form?: { [index: string]: any };
+    content_id?: string | null;
+    id?: number;
+    errors?: string[] | null;
+    input_connections: StepInputConnection;
+    inputs: Array<InputTerminalSource>;
+    label?: string;
+    name: string;
+    outputs: Array<OutputTerminalSource>;
+    position?: StepPosition;
+    post_job_actions?: PostJobActions;
+    tool_state: Record<string, unknown>;
+    tooltip?: string;
+    type: "tool" | "data_input" | "data_collection_input" | "subworkflow" | "parameter_input" | "pause";
+    uuid?: string;
+    workflow_outputs?: WorkflowOutput[];
+}
+
+export interface Step extends NewStep {
+    id: number;
+}
+
+export interface Steps {
+    [index: string]: Step;
+}
+
+export interface StepInputConnection {
+    [index: string]: ConnectionOutputLink | ConnectionOutputLink[];
+}
+
+export interface ConnectionOutputLink {
+    output_name: string;
+    id: number;
+}
+
+interface WorkflowOutputs {
+    [index: string]: {
+        stepId: number;
+        outputName: string;
+    };
+}
+
+export const useWorkflowStepStore = defineStore("workflowStepStore", {
+    state: (): State => ({
+        steps: {} as Steps,
+        stepMapOver: {} as { [index: number]: CollectionTypeDescriptor },
+        stepIndex: -1,
+    }),
+    getters: {
+        getStep(state: State) {
+            return (stepId: number): Step => {
+                return state.steps[stepId.toString()];
+            };
+        },
+        getStepIndex(state: State) {
+            return Math.max(...Object.values(state.steps).map((step) => step.id), state.stepIndex);
+        },
+        hasActiveOutputs(state: State) {
+            return Boolean(Object.values(state.steps).find((step) => step.workflow_outputs?.length));
+        },
+        workflowOutputs(state: State) {
+            const workflowOutputs: WorkflowOutputs = {};
+            Object.values(state.steps).forEach((step) => {
+                if (step.workflow_outputs?.length) {
+                    step.workflow_outputs.forEach((workflowOutput) => {
+                        if (workflowOutput.label) {
+                            workflowOutputs[workflowOutput.label] = {
+                                outputName: workflowOutput.output_name,
+                                stepId: step.id,
+                            };
+                        }
+                    });
+                }
+            });
+            return workflowOutputs;
+        },
+    },
+    actions: {
+        addStep(newStep: NewStep): Step {
+            const stepId = newStep.id ? newStep.id : this.getStepIndex + 1;
+            newStep.id = stepId;
+            const step = newStep as Step;
+            Vue.set(this.steps, stepId.toString(), step);
+            const connectionStore = useConnectionStore();
+            stepToConnections(step).map((connection) => connectionStore.addConnection(connection));
+            return step;
+        },
+        updateStep(this: State, step: Step) {
+            step.workflow_outputs = step.workflow_outputs?.filter((workflowOutput) =>
+                step.outputs.find((output) => workflowOutput.output_name == output.name)
+            );
+            this.steps[step.id.toString()] = step;
+        },
+        changeStepMapOver(stepId: number, mapOver: CollectionTypeDescriptor) {
+            this.stepMapOver[stepId] = mapOver;
+        },
+        addConnection(connection: Connection) {
+            const inputStep = this.getStep(connection.input.stepId);
+            const updatedStep = {
+                ...inputStep,
+                input_connections: {
+                    ...inputStep.input_connections,
+                    [connection.input.name]: { output_name: connection.output.name, id: connection.output.stepId },
+                },
+            };
+            this.updateStep(updatedStep);
+        },
+        removeConnection(connection: Connection) {
+            const inputStep = this.getStep(connection.input.stepId);
+            Vue.delete(inputStep.input_connections, connection.input.name);
+            this.updateStep(inputStep);
+        },
+        removeStep(this: State, stepId: number) {
+            const connectionStore = useConnectionStore();
+            connectionStore
+                .getConnectionsForStep(stepId)
+                .map((connection) => connectionStore.removeConnection(connection.input));
+            Vue.delete(this.steps, stepId.toString());
+        },
+    },
+});
+
+export function stepToConnections(step: Step): Connection[] {
+    const connections: Connection[] = [];
+    if (step.input_connections) {
+        Object.entries(step?.input_connections).forEach(([input_name, outputArray]) => {
+            if (!Array.isArray(outputArray)) {
+                outputArray = [outputArray];
+            }
+            outputArray.forEach((output) => {
+                const connection = new Connection(
+                    {
+                        stepId: step.id,
+                        name: input_name,
+                        connectorType: "input",
+                    },
+                    {
+                        stepId: output.id,
+                        name: output.output_name,
+                        connectorType: "output",
+                    }
+                );
+                connections.push(connection);
+            });
+        });
+    }
+    return connections;
+}
diff --git a/client/src/style/scss/base.scss b/client/src/style/scss/base.scss
index bdaa9ab5fad..ae424ffa725 100644
--- a/client/src/style/scss/base.scss
+++ b/client/src/style/scss/base.scss
@@ -324,67 +324,6 @@ body {
     }
 }
 
-// ==== Masthead ====
-#masthead {
-    @extend .p-0;
-    @extend .mb-0;
-    background-color: $brand-masthead;
-    height: $masthead-height;
-    .navbar-nav {
-        height: $masthead-height;
-        > li {
-            // This allows the background color to fill the full height of the
-            // masthead, while still keeping the contents centered (using flex)
-            min-height: 100%;
-            display: flex;
-            align-items: center;
-            &.active {
-                background: darken($brand-masthead, 10%);
-            }
-            .nav-link {
-                position: relative;
-                cursor: pointer;
-                text-decoration: none;
-                color: $brand-masthead-text;
-                &:hover {
-                    color: $brand-masthead-text-hover;
-                }
-                &.nav-icon {
-                    font-size: 1.3em;
-                    .nav-note {
-                        @extend .font-weight-bold;
-                        @extend .position-absolute;
-                        left: 1.9rem;
-                        top: 1.9rem;
-                        font-size: 0.6rem;
-                    }
-                }
-                &.toggle {
-                    color: $brand-masthead-text-hover;
-                }
-            }
-        }
-    }
-    .navbar-brand {
-        @extend .ml-2;
-        @extend .mr-1;
-        button {
-            @extend .p-0;
-            img {
-                display: inline;
-                border: none;
-                height: 2.22rem;
-            }
-        }
-    }
-    .navbar-brand-title {
-        font-weight: bold;
-        font-family: Verdana, sans-serif;
-        font-size: calc($masthead-height / 3);
-        line-height: calc($masthead-height / 3);
-    }
-}
-
 // State colors
 
 $galaxy-state-border: (
diff --git a/client/src/style/scss/custom_theme_variables.scss b/client/src/style/scss/custom_theme_variables.scss
new file mode 100644
index 00000000000..bcf04723bd3
--- /dev/null
+++ b/client/src/style/scss/custom_theme_variables.scss
@@ -0,0 +1,11 @@
+@import "theme/blue.scss";
+
+html {
+    --masthead-color: #{$masthead-color};
+    --masthead-text-color: #{$masthead-text-color};
+    --masthead-text-hover: #{$masthead-text-hover};
+    --masthead-text-active: #{$masthead-text-active};
+    --masthead-link-color: #{$masthead-link-color};
+    --masthead-link-hover: #{$masthead-link-hover};
+    --masthead-link-active: #{$masthead-link-active};
+}
diff --git a/client/src/style/scss/theme/blue.scss b/client/src/style/scss/theme/blue.scss
index a9018b16eb2..f2c39fdaac0 100644
--- a/client/src/style/scss/theme/blue.scss
+++ b/client/src/style/scss/theme/blue.scss
@@ -10,10 +10,13 @@ $brand-dark: #2c3143;
 $brand-toggle: gold;
 
 // Masthead colors
-$brand-masthead: $brand-dark;
-$brand-masthead-text: $brand-light;
-$brand-masthead-text-active: lighten($brand-light, 15%);
-$brand-masthead-text-hover: $brand-toggle;
+$masthead-color: $brand-dark;
+$masthead-text-color: $brand-light;
+$masthead-text-active: lighten($brand-light, 15%);
+$masthead-text-hover: $brand-toggle;
+$masthead-link-color: transparent;
+$masthead-link-hover: transparent;
+$masthead-link-active: darken($masthead-color, 10%);
 
 // Text colors
 $text-color: $brand-dark;
diff --git a/client/src/style/scss/toolshed.scss b/client/src/style/scss/toolshed.scss
index 329a37b3261..1be1c16cc9e 100644
--- a/client/src/style/scss/toolshed.scss
+++ b/client/src/style/scss/toolshed.scss
@@ -19,3 +19,22 @@
         list-style-type: none;
     }
 }
+
+.masthead-toolshed {
+    background-color: $brand-dark;
+    height: $masthead-height;
+    .navbar-brand {
+        position: absolute;
+        left: 0.5rem;
+        .navbar-brand-image {
+            max-height: 2rem;
+        }
+    }
+    .navbar-brand-title {
+        color: $brand-light;
+        font-size: 1.1rem;
+    }
+    .nav-link {
+        color: $brand-light !important;
+    }
+}
diff --git a/client/src/style/scss/ui.scss b/client/src/style/scss/ui.scss
index 14859cd17e1..9726e862dfa 100644
--- a/client/src/style/scss/ui.scss
+++ b/client/src/style/scss/ui.scss
@@ -102,15 +102,6 @@ $ui-margin-horizontal-large: $margin-v * 2;
     cursor: pointer;
 }
 
-.ui-btn-back-to-top {
-    bottom: 2em;
-    position: fixed;
-    opacity: 0.5;
-}
-.ui-btn-back-to-top:hover {
-    opacity: 1;
-}
-
 // thumbnails
 .ui-thumbnails {
     .ui-thumbnails-item {
@@ -443,14 +434,17 @@ $ui-margin-horizontal-large: $margin-v * 2;
     font-size: $font-size-base;
 }
 
-/* hides element in a way where it can still be read by screen-readers */
-.hide-element {
-    border: 0;
-    clip: rect(1px, 1px, 1px, 1px);
-    height: 1px;
-    margin: -1px;
-    overflow: hidden;
-    padding: 0;
-    position: absolute;
-    width: 1px;
+// makes a button element look like a link
+.ui-link {
+    border: none !important;
+    background: none !important;
+    padding: 0 !important;
+    color: $brand-primary;
+    display: inline;
+    line-height: unset;
+    vertical-align: unset;
+
+    &:hover {
+        text-decoration: underline;
+    }
 }
diff --git a/client/src/style/scss/unsorted.scss b/client/src/style/scss/unsorted.scss
index 09f168bfe32..30367852fde 100644
--- a/client/src/style/scss/unsorted.scss
+++ b/client/src/style/scss/unsorted.scss
@@ -736,39 +736,6 @@ div.toolSectionTitle {
     }
 }
 
-#loading_indicator {
-    position: fixed;
-    right: 10px;
-    top: 10px;
-    height: 32px;
-    width: 32px;
-    display: none;
-    background: url(../../assets/images/largespinner.gif);
-}
-
-#content_table td {
-    text-align: right;
-    white-space: nowrap;
-    padding: 2px 10px;
-}
-
-#content_table th {
-    white-space: nowrap;
-    padding: 2px 10px;
-}
-
-#content_table td.stringalign {
-    text-align: left;
-}
-
-#content_table .dark_row {
-    background-color: #ddd;
-}
-
-#content_table th {
-    background-color: #aaa;
-}
-
 // ==== Integrated tool form styles
 
 .toolMenuAndView .toolForm {
@@ -992,14 +959,3 @@ body.reports {
         margin-left: 10px;
     }
 }
-
-/* Used in Galaxy IE for spinner loading TODO: Remove in IE entrypoint refactoring */
-#ie-loading-spinner {
-    position: absolute;
-    margin: auto;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background: url(../../assets/images/largespinner.gif) no-repeat center center fixed;
-}
diff --git a/client/src/style/scss/workflow.scss b/client/src/style/scss/workflow.scss
index 5bea1908906..eb94d9c3dfa 100644
--- a/client/src/style/scss/workflow.scss
+++ b/client/src/style/scss/workflow.scss
@@ -1,3 +1,17 @@
+.canvas-svg {
+    // not sure if hack or not ...
+    overflow: visible;
+    display: block;
+}
+
+.node-area {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    transform-origin: 0 0;
+}
 .workflow-client {
     .workflow-panel {
         background: $white;
@@ -58,30 +72,54 @@
             }
         }
         .workflow-canvas {
-            #canvas-viewport {
+            // Set the position to relative, so that absolute position coordinates are relative to the canvas (and not the top of the iframe)
+            position: relative;
+
+            .canvas-content {
+                width: 100%;
+                height: 100%;
+                position: absolute;
+                left: 0px;
+                top: 0px;
+                overflow: hidden;
+            }
+            .canvas-background {
                 @extend .rounded;
                 background: $workflow-editor-bg;
                 background-size: $workflow-editor-grid-size $workflow-editor-grid-size;
                 background-image: linear-gradient(to right, $workflow-editor-grid-color 1px, transparent 1px),
                     linear-gradient(to bottom, $workflow-editor-grid-color 1px, transparent 1px);
-                width: 100%;
-                height: 100%;
+                // Set width and height to 10 times larger than canvas, so that we can zoom out and still see the grid
+                width: 1000%;
+                height: 1000%;
+                // Set the initial position to the center of the canvas, again so that we can zoom out and still see the grid in the top left direction
+                top: -500%;
+                left: -500%;
+                transform-origin: center;
                 position: relative;
-                overflow: hidden;
             }
             .ribbon {
                 .ribbon-outer {
                     stroke: $brand-primary;
                 }
+                .ribbon-outer:active {
+                    stroke: $brand-success;
+                }
                 .ribbon-inner {
                     stroke: $white;
                 }
+                .ribbon-inner:active {
+                    stroke: $brand-success;
+                }
                 .ribbon-inner-valid {
                     stroke: $brand-success;
                 }
                 .ribbon-inner-invalid {
                     stroke: $brand-warning;
                 }
+                &:hover .ribbon-outer {
+                    stroke: $brand-success;
+                }
             }
             .base-terminal {
                 @extend .fa;
@@ -89,7 +127,6 @@
                 @extend .mt-1;
                 color: $brand-light;
                 position: absolute;
-                z-index: 101;
                 .icon {
                     @extend .fa;
                     @extend .fa-chevron-circle-right;
@@ -131,7 +168,6 @@
                 @extend .fa-circle;
                 color: $brand-success;
                 position: absolute;
-                z-index: 101;
             }
             .mark-terminal {
                 @extend .far;
@@ -142,6 +178,14 @@
                     @extend .fa;
                     @extend .fa-check-square;
                 }
+                &.mark-terminal-visible {
+                    @extend .fa;
+                    @extend .fa-eye;
+                }
+                &.mark-terminal-hidden {
+                    @extend .fa;
+                    @extend .fa-eye-slash;
+                }
             }
             .delete-terminal {
                 @extend .btn;
@@ -179,12 +223,28 @@
                 max-height: 300px;
                 min-width: 50px;
                 min-height: 50px;
+                .viewport {
+                    stroke: #25537b;
+                }
                 .workflow-overview-body {
                     position: relative;
                     overflow: hidden;
                     width: 100%;
                     height: 100%;
                 }
+                .mini-node {
+                    + .ok {
+                        // this is $primary-brand / #25537b
+                        filter: invert(26%) sepia(75%) saturate(489%) hue-rotate(166deg) brightness(90%) contrast(89%);
+                    }
+                    + .error {
+                        // this is #e31a1e
+                        filter: invert(16%) sepia(86%) saturate(3962%) hue-rotate(350deg) brightness(96%) contrast(97%);
+                    }
+                    + .highlight {
+                        filter: invert(14%) sepia(38%) saturate(1544%) hue-rotate(321deg) brightness(84%) contrast(117%);
+                    }
+                }
             }
             #input-choices-menu {
                 color: black;
@@ -193,11 +253,6 @@
         .workflow-report-body {
             display: flex;
         }
-        #canvas-container {
-            position: absolute;
-            width: 100%;
-            height: 100%;
-        }
         #overview-container {
             position: absolute;
         }
diff --git a/client/src/ui/scroll-panel.js b/client/src/ui/scroll-panel.js
deleted file mode 100644
index d1192aabace..00000000000
--- a/client/src/ui/scroll-panel.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import $ from "jquery";
-
-// This is an extension to jQuery UI draggable
-// When dragging move the parent element ("panel") relative to its parent
-// ("viewport") so that the draggable is always visible.
-
-$.ui.plugin.add("draggable", "scrollPanel", {
-    drag: function (e, ui) {
-        var instance = $(this).data("draggable");
-        clearTimeout(instance.timeout);
-        var o = ui.options;
-        var element = instance.element;
-        var panel = o.panel;
-        var panel_pos = panel.position();
-        var panel_w = panel.width();
-        var panel_h = panel.height();
-        var viewport = panel.parent();
-        var viewport_w = viewport.width();
-        var viewport_h = viewport.height();
-        var element_w = element.width();
-        var element_h = element.height();
-        var moved = false;
-        var close_dist = 5;
-        var nudge = 23;
-
-        var // Legal panel range
-            p_min_x = -(panel_w - viewport_w);
-
-        var p_min_y = -(panel_h - viewport_h);
-        var p_max_x = 0;
-        var p_max_y = 0;
-
-        var // Visible
-            min_vis_x = -panel_pos.left;
-
-        var max_vis_x = min_vis_x + viewport_w;
-        var min_vis_y = -panel_pos.top;
-        var max_vis_y = min_vis_y + viewport_h;
-
-        // Mouse
-        var mouse_x = ui.position.left + instance.offset.click.left;
-        var mouse_y = ui.position.top + instance.offset.click.top;
-
-        // Move it
-        if (panel_pos.left < p_max_x && mouse_x - close_dist < min_vis_x) {
-            const t = Math.min(nudge, p_max_x - panel_pos.left);
-            panel.css("left", panel_pos.left + t);
-            moved = true;
-            instance.offset.parent.left += t;
-            ui.position.left -= t;
-        }
-        if (!moved && panel_pos.left > p_min_x && mouse_x + close_dist > max_vis_x) {
-            const t = Math.min(nudge, panel_pos.left - p_min_x);
-            panel.css("left", panel_pos.left - t);
-            moved = true;
-            instance.offset.parent.left -= t;
-            ui.position.left += t;
-        }
-        if (!moved && panel_pos.top < p_max_y && mouse_y - close_dist < min_vis_y) {
-            const t = Math.min(nudge, p_max_y - panel_pos.top);
-            panel.css("top", panel_pos.top + t);
-            // Firefox sometimes moves by less, so we need to check. Yuck.
-            const amount_moved = panel.position().top - panel_pos.top;
-            instance.offset.parent.top += amount_moved;
-            ui.position.top -= amount_moved;
-            moved = true;
-        }
-        if (!moved && panel_pos.top > p_min_y && mouse_y + close_dist > max_vis_y) {
-            var t = Math.min(nudge, panel_pos.top - p_min_x);
-            panel.css("top", `${panel_pos.top - t}px`);
-            // Firefox sometimes moves by less, so we need to check. Yuck.
-            const amount_moved = panel_pos.top - panel.position().top;
-            instance.offset.parent.top -= amount_moved;
-            ui.position.top += amount_moved;
-            moved = true;
-        }
-        // Still contain in panel
-        ui.position.left = Math.max(ui.position.left, 0);
-        ui.position.top = Math.max(ui.position.top, 0);
-        ui.position.left = Math.min(ui.position.left, panel_w - element_w);
-        ui.position.top = Math.min(ui.position.top, panel_h - element_h);
-        // Update offsets
-        if (moved) {
-            $.ui.ddmanager.prepareOffsets(instance, e);
-        }
-        // Keep moving even if mouse doesn't move
-        if (moved) {
-            instance.old_e = e;
-            instance.timeout = setTimeout(() => {
-                instance.mouseMove(e);
-            }, 50);
-        }
-    },
-    stop: function (e, ui) {
-        var instance = $(this).data("draggable");
-        clearTimeout(instance.timeout);
-    },
-});
diff --git a/client/src/utils/color.js b/client/src/utils/color.js
index 054f0429a37..f75ff5ed6bd 100644
--- a/client/src/utils/color.js
+++ b/client/src/utils/color.js
@@ -18,7 +18,8 @@ export function keyedColorScheme(strKey) {
 
     const [r, g, b] = hsluvToRgb([hue, 100, lightness]);
     const primary = `rgb(${r * 255},${g * 255},${b * 255})`;
-    const darker = hsluvToHex([hue, 100, lightness - 20]);
+    const darker = hsluvToHex([hue, 100, lightness * 0.9]);
+    const dimmed = hsluvToHex([hue, 100, lightness * 0.95]);
 
-    return { primary, darker };
+    return { primary, darker, dimmed };
 }
diff --git a/client/src/utils/data.js b/client/src/utils/data.js
index 8f0856364a3..ab874647da1 100644
--- a/client/src/utils/data.js
+++ b/client/src/utils/data.js
@@ -4,12 +4,12 @@ import Vue from "vue";
 import DataDialog from "components/DataDialog/DataDialog.vue";
 import { FilesDialog } from "components/FilesDialog";
 import DatasetCollectionDialog from "components/SelectionDialog/DatasetCollectionDialog.vue";
-import { mountUploadModal } from "components/Upload";
 import { uploadModelsToPayload } from "components/Upload/helpers";
 import { getGalaxyInstance } from "app";
 import { getAppRoot } from "onload/loadConfig";
 import { submitUpload } from "utils/uploadbox";
 import { rewatchHistory } from "store/historyStore/model/watchHistory";
+import { useGlobalUploadModal } from "composables/globalUploadModal";
 
 // This should be moved more centrally (though still hanging off Galaxy for
 // external use?), and populated from the store; just using this as a temporary
@@ -44,7 +44,8 @@ export function dialog(callback, options = {}) {
             history: history_id,
         });
         if (options.new) {
-            mountUploadModal(options);
+            const { openGlobalUploadModal } = useGlobalUploadModal();
+            openGlobalUploadModal(options);
         } else {
             _mountSelectionDialog(DataDialog, options);
         }
diff --git a/client/src/utils/filterConversion.js b/client/src/utils/filterConversion.js
deleted file mode 100644
index 24e45f6bbbb..00000000000
--- a/client/src/utils/filterConversion.js
+++ /dev/null
@@ -1,316 +0,0 @@
-/**
- * This module handles the filtering for content items. User specified filters are applied on the data available in the store and
- * are additionally parsed as query parameters to the API endpoint. User can engage filters by specifying a query QUERY:VALUE pair
- * e.g. hid:61 in the history search field. Each query key has a default suffix defined e.g. hid:61 is equivalent to hid-eq:61.
- * Additionally, underscores and dashes in the QUERY are interchangeable. Quotation marks (') are only allowed in the VALUE.
- * Comparison aliases are allowed converting e.g. ">" to "-gt:" and "<" to "-lt". The following query pairs are equivalent:
- * create_time:'March 12, 2022', create-time-lt:'March 12, 2022'.
- *
- * The format is: `QUERY[:, < or >]VALUE`. QUERYs may only contain characters and, interchangeably, underscores (_) and dashes (-).
- * Use quotations (') around values containing spaces.
- */
-
-/** Default filters are set, unless explicitly specified by the user. */
-export const defaultFilters = {
-    deleted: false,
-    visible: true,
-};
-
-/** Add comparison aliases i.e. '*>value' is converted to '*_gt=value' */
-export const validAlias = [
-    [">", "_gt"],
-    ["<", "_lt"],
-];
-
-/** Converts user input to backend compatible date. */
-function toDate(value) {
-    return Date.parse(value) / 1000;
-}
-
-/** Converts user input for case-insensitive filtering. */
-export function toLower(value) {
-    return String(value).toLowerCase();
-}
-
-/** Converts user input to boolean. */
-export function toBool(value) {
-    return toLower(value) === "true";
-}
-
-/** Converts user input to lower case and strips quotation marks. */
-export function toLowerNoQuotes(value) {
-    return toLower(value).replaceAll("'", "");
-}
-
-/** Converts name tags starting with '#' to 'name:' */
-export function expandNameTag(value) {
-    if (value && typeof value === "string" && value.startsWith("#")) {
-        value = value.replace("#", "name:");
-    }
-    return toLower(value);
-}
-
-/**
- * Checks if a query value is equal to the item value
- * @param {*} attribute of the content item
- * @param {*} query parameter if the attribute does not match the server query key
- * @param {*} converter if item attribute value has to be transformed e.g. to a date.
- */
-function equals(attribute, query = null, converter = null) {
-    return {
-        attribute,
-        converter,
-        query: query || `${attribute}-eq`,
-        handler: (v, q) => {
-            if (converter) {
-                v = converter(v);
-                q = converter(q);
-            }
-            return toLower(v) === toLower(q);
-        },
-    };
-}
-
-/**
- * Checks if a query value is part of the item value
- * @param {*} attribute of the content item
- * @param {*} query parameter if the attribute does not match the server query key
- * @param {*} converter if item attribute value has to be transformed e.g. to a date.
- */
-function contains(attribute, query = null, converter = null) {
-    return {
-        attribute,
-        converter,
-        query: query || `${attribute}-contains`,
-        handler: (v, q) => {
-            if (converter) {
-                v = converter(v);
-                q = converter(q);
-            }
-            return toLower(v).includes(toLower(q));
-        },
-    };
-}
-
-/**
- * Checks if a value is greater or smaller than the item value
- * @param {*} attribute of the content item
- * @param {*} variant specifying the comparison operation e.g. le(<=) and gt(>)
- * @param {*} converter if item attribute value has to be transformed e.g. to a date.
- */
-function compare(attribute, variant, converter = null) {
-    return {
-        attribute,
-        converter,
-        query: `${attribute}-${variant}`,
-        handler: (v, q) => {
-            if (converter) {
-                v = converter(v);
-                q = converter(q);
-            }
-            switch (variant) {
-                case "lt":
-                    return v < q;
-                case "le":
-                    return v <= q;
-                case "ge":
-                    return v >= q;
-                case "gt":
-                    return v > q;
-            }
-        },
-    };
-}
-
-/** Valid filter fields and handlers which can be used for text searches. */
-export const validFilters = {
-    hid: equals("hid"),
-    state: equals("state"),
-    name: contains("name"),
-    extension: equals("extension"),
-    annotation: contains("annotation"),
-    hid_ge: compare("hid", "ge"),
-    hid_gt: compare("hid", "gt"),
-    hid_le: compare("hid", "le"),
-    hid_lt: compare("hid", "lt"),
-    tag: contains("tags", "tag", expandNameTag),
-    visible: equals("visible", "visible", toBool),
-    deleted: equals("deleted", "deleted", toBool),
-    create_time: compare("create_time", "le", toDate),
-    create_time_ge: compare("create_time", "ge", toDate),
-    create_time_gt: compare("create_time", "gt", toDate),
-    create_time_le: compare("create_time", "le", toDate),
-    create_time_lt: compare("create_time", "lt", toDate),
-    update_time: compare("update_time", "le", toDate),
-    update_time_ge: compare("update_time", "ge", toDate),
-    update_time_gt: compare("update_time", "gt", toDate),
-    update_time_le: compare("update_time", "le", toDate),
-    update_time_lt: compare("update_time", "lt", toDate),
-};
-
-/** Checks if filterSettings have default values. */
-export function containsDefaults(filterSettings) {
-    const normalized = getDefaults();
-    let hasDefaults = true;
-    for (const key in normalized) {
-        const value = String(filterSettings[key]).toLowerCase();
-        const normalizedValue = String(normalized[key]).toLowerCase();
-        if (value !== normalizedValue) {
-            hasDefaults = false;
-            break;
-        }
-    }
-    return hasDefaults;
-}
-
-/** Normalize defaults by adding the operator to the key identifier */
-export function getDefaults() {
-    const normalized = {};
-    Object.entries(defaultFilters).forEach(([key, value]) => {
-        normalized[`${key}:`] = value;
-    });
-    return normalized;
-}
-
-/** Build a text filter from filter settings */
-export function getFilterText(filterSettings) {
-    const normalized = getDefaults();
-    const hasDefaults = containsDefaults(filterSettings);
-
-    let newFilterText = "";
-    Object.entries(filterSettings).forEach(([key, value]) => {
-        const skipDefault = hasDefaults && normalized[key] !== undefined;
-        if (!skipDefault && value !== undefined && value !== "") {
-            if (newFilterText) {
-                newFilterText += " ";
-            }
-            if (String(value).includes(" ")) {
-                value = `'${value}'`;
-            }
-            newFilterText += `${key}${value}`;
-        }
-    });
-    return newFilterText;
-}
-
-/** Parses single text input into a dict of field->value pairs. */
-export function getFilters(filterText, useDefaultFilters = true) {
-    const pairSplitRE = /[^\s']+(?:'[^']*'[^\s']*)*|(?:'[^']*'[^\s']*)+/g;
-    const matches = filterText.match(pairSplitRE);
-    let result = {};
-    let hasMatches = false;
-    if (matches) {
-        matches.forEach((pair) => {
-            const elgRE = /(\S+)([:><])(.+)/g;
-            const elgMatch = elgRE.exec(pair);
-            if (elgMatch) {
-                let field = elgMatch[1];
-                const elg = elgMatch[2];
-                const value = elgMatch[3];
-                // replace alias for less and greater symbol
-                for (const [alias, substitute] of validAlias) {
-                    if (elg === alias) {
-                        field = `${field}${substitute}`;
-                        break;
-                    }
-                }
-                // replaces dashes with underscores in query field names
-                const normalizedField = field.replaceAll("-", "_");
-                if (validFilters[normalizedField]) {
-                    // removes quotation and applies lower-case to filter value
-                    result[normalizedField] = toLowerNoQuotes(value);
-                    hasMatches = true;
-                }
-            }
-        });
-    }
-    // assume name matching if no filter key has been matched
-    if (!hasMatches && filterText.length > 0) {
-        result["name"] = filterText;
-    }
-    // check if any default filter keys have been used
-    let hasDefaults = false;
-    for (const defaultKey in defaultFilters) {
-        if (result[defaultKey]) {
-            hasDefaults = true;
-            break;
-        }
-    }
-    // use default filters if none of the default filters has been explicitly specified
-    if (!hasDefaults && useDefaultFilters) {
-        result = { ...result, ...defaultFilters };
-    }
-    return Object.entries(result);
-}
-
-/** Returns a dictionary resembling filterSettings (for HistoryFilters):
- * e.g.: Unlike getFilters or getQueryDict, this maintains "hid>":"3" instead
- *       of changing it to "hid-gt":"3"
- * Only used to sync filterSettings (in HistoryFilters)
- * @param {Object} filters Parsed filterText from getFilters()
- */
-export function toAlias(filters) {
-    const result = {};
-    for (const [key, value] of filters) {
-        let hasAlias = false;
-        for (const [alias, substitute] of validAlias) {
-            if (key.endsWith(substitute)) {
-                const keyPrefix = key.substr(0, key.length - substitute.length);
-                result[`${keyPrefix}${alias}`] = value;
-                hasAlias = true;
-                break;
-            }
-        }
-        if (!hasAlias) {
-            result[`${key}:`] = value;
-        }
-    }
-    return result;
-}
-
-/** Returns a dictionary with query key and values.
- * @param {String} filterText The raw filter text
- * @param {Boolean} [useDefaultFilters=true] The default filters are set if true
- */
-export function getQueryDict(filterText, useDefaultFilters = true) {
-    const queryDict = {};
-    const filters = getFilters(filterText, useDefaultFilters);
-    for (const [key, value] of filters) {
-        const query = validFilters[key].query;
-        const converter = validFilters[key].converter;
-        queryDict[query] = converter ? converter(value) : value;
-    }
-    return queryDict;
-}
-
-/** Returns query string from filter text.
- * @param {String} filterText The raw filter text
- * @param {Boolean} useDefaultFilters The default filters are set if true
- * */
-export function getQueryString(filterText, useDefaultFilters = true) {
-    const filterDict = getQueryDict(filterText, useDefaultFilters);
-    return Object.entries(filterDict)
-        .map(([f, v]) => `q=${f}&qv=${v}`)
-        .join("&");
-}
-
-/** Check the value of a particular filter. */
-export function checkFilter(filterText, filterName, filterValue) {
-    const re = new RegExp(`${filterName}:(\\S+)`);
-    const reMatch = re.exec(filterText);
-    const testValue = reMatch ? reMatch[1] : defaultFilters[filterName];
-    return toLowerNoQuotes(testValue) === toLowerNoQuotes(filterValue);
-}
-
-/** Test if an item passes all filters. */
-export function testFilters(filters, item) {
-    for (const [key, filterValue] of filters) {
-        const filterAttribute = validFilters[key].attribute;
-        const filterHandler = validFilters[key].handler;
-        const itemValue = item[filterAttribute];
-        if (!filterHandler(itemValue, filterValue)) {
-            return false;
-        }
-    }
-    return true;
-}
diff --git a/client/src/utils/filterConversion.test.js b/client/src/utils/filterConversion.test.js
index 6e3c8c82315..164e5e7db57 100644
--- a/client/src/utils/filterConversion.test.js
+++ b/client/src/utils/filterConversion.test.js
@@ -1,8 +1,8 @@
-import { containsDefaults, defaultFilters, getDefaults, getFilterText } from "./filterConversion";
+import { HistoryFilters } from "components/History/HistoryFilters";
 
 describe("test filtering helpers to convert settings to filter text", () => {
     it("conversion from settings to new filter text", async () => {
-        const normalized = getDefaults();
+        const normalized = HistoryFilters.getDefaults();
         expect(Object.keys(normalized).length).toBe(2);
         expect(normalized["deleted:"]).toBe(false);
         expect(normalized["visible:"]).toBe(true);
@@ -10,31 +10,31 @@ describe("test filtering helpers to convert settings to filter text", () => {
 
     it("verify the existence of defaults", async () => {
         const settings = {};
-        Object.entries(defaultFilters).forEach(([key, value]) => {
+        Object.entries(HistoryFilters.defaultFilters).forEach(([key, value]) => {
             settings[`${key}:`] = value;
         });
-        expect(containsDefaults(settings)).toBe(true);
-        settings["deleted:"] = !defaultFilters.deleted;
-        expect(containsDefaults(settings)).toBe(false);
-        settings["deleted:"] = defaultFilters.deleted;
-        settings["visible:"] = !defaultFilters.visible;
-        expect(containsDefaults(settings)).toBe(false);
-        settings["visible:"] = String(defaultFilters.visible).toUpperCase();
-        expect(containsDefaults(settings)).toBe(true);
+        expect(HistoryFilters.containsDefaults(settings)).toBe(true);
+        settings["deleted:"] = !HistoryFilters.defaultFilters.deleted;
+        expect(HistoryFilters.containsDefaults(settings)).toBe(false);
+        settings["deleted:"] = HistoryFilters.defaultFilters.deleted;
+        settings["visible:"] = !HistoryFilters.defaultFilters.visible;
+        expect(HistoryFilters.containsDefaults(settings)).toBe(false);
+        settings["visible:"] = String(HistoryFilters.defaultFilters.visible).toUpperCase();
+        expect(HistoryFilters.containsDefaults(settings)).toBe(true);
     });
 
     it("verify correct conversion of settings", async () => {
         const settings = {
-            "deleted:": defaultFilters.deleted,
-            "visible:": defaultFilters.visible,
+            "deleted:": HistoryFilters.defaultFilters.deleted,
+            "visible:": HistoryFilters.defaultFilters.visible,
             "other:": "other",
             "anything:": undefined,
             "value:": "",
         };
-        expect(getFilterText(settings)).toBe("other:other");
-        settings["visible:"] = !defaultFilters.visible;
-        expect(getFilterText(settings)).toBe("deleted:false visible:false other:other");
-        settings["visible:"] = defaultFilters.visible;
-        expect(getFilterText(settings)).toBe("other:other");
+        expect(HistoryFilters.getFilterText(settings)).toBe("other:other");
+        settings["visible:"] = !HistoryFilters.defaultFilters.visible;
+        expect(HistoryFilters.getFilterText(settings)).toBe("deleted:false visible:false other:other");
+        settings["visible:"] = HistoryFilters.defaultFilters.visible;
+        expect(HistoryFilters.getFilterText(settings)).toBe("other:other");
     });
 });
diff --git a/client/src/utils/filtering.test.js b/client/src/utils/filtering.test.js
index ac2b246d9be..da88b73a243 100644
--- a/client/src/utils/filtering.test.js
+++ b/client/src/utils/filtering.test.js
@@ -1,4 +1,4 @@
-import { checkFilter, getFilters, getQueryDict, testFilters, toAlias } from "./filterConversion";
+import { HistoryFilters } from "components/History/HistoryFilters";
 
 const filterTexts = [
     "name:'name of item' hid>10 hid<100 create-time>'2021-01-01' update-time<'2022-01-01' state:success extension:ext tag:first deleted:False visible:'TRUE'",
@@ -7,37 +7,48 @@ const filterTexts = [
 
 describe("filtering", () => {
     test("parse default filter", () => {
-        let queryDict = getQueryDict("");
+        let queryDict = HistoryFilters.getQueryDict("");
         expect(queryDict["deleted"]).toBe(false);
         expect(queryDict["visible"]).toBe(true);
-        queryDict = getQueryDict("deleted:true");
+        queryDict = HistoryFilters.getQueryDict("deleted:true");
         expect(queryDict["deleted"]).toBe(true);
         expect(queryDict["visible"]).toBeUndefined();
-        queryDict = getQueryDict("visible:false");
+        queryDict = HistoryFilters.getQueryDict("visible:false");
         expect(queryDict["deleted"]).toBeUndefined;
         expect(queryDict["visible"]).toBe(false);
-        queryDict = getQueryDict("extension:ext");
+        queryDict = HistoryFilters.getQueryDict("extension:ext");
         expect(queryDict["extension-eq"]).toBe("ext");
         expect(queryDict["deleted"]).toBe(false);
         expect(queryDict["visible"]).toBe(true);
     });
     test("parse name filter", () => {
-        const filters = getFilters("name of item");
+        const filters = HistoryFilters.getFilters("name of item");
         expect(filters[0][0]).toBe("name");
         expect(filters[0][1]).toBe("name of item");
-        const queryDict = getQueryDict("name of item");
+        const queryDict = HistoryFilters.getQueryDict("name of item");
         expect(queryDict["name-contains"]).toBe("name of item");
     });
     test("parse check filter", () => {
-        expect(checkFilter(filterTexts[0], "tag", "first")).toBe(true);
-        expect(checkFilter(filterTexts[0], "tag", "second")).toBe(false);
-        expect(checkFilter(filterTexts[0], "deleted", "false")).toBe(true);
-        expect(checkFilter(filterTexts[0], "visible", true)).toBe(true);
-        expect(checkFilter(filterTexts[0], "visible", "false")).toBe(false);
+        expect(HistoryFilters.checkFilter(filterTexts[0], "name", "name of item")).toBe(true);
+        expect(HistoryFilters.checkFilter(filterTexts[0], "tag", "first")).toBe(true);
+        expect(HistoryFilters.checkFilter(filterTexts[0], "tag", "second")).toBe(false);
+        expect(HistoryFilters.checkFilter(filterTexts[0], "deleted", "false")).toBe(true);
+        expect(HistoryFilters.checkFilter(filterTexts[0], "visible", true)).toBe(true);
+        expect(HistoryFilters.checkFilter(filterTexts[0], "visible", "false")).toBe(false);
+    });
+    test("parse get filter value", () => {
+        expect(HistoryFilters.getFilterValue(filterTexts[0], "name")).toBe("name of item");
+        expect(HistoryFilters.getFilterValue(filterTexts[0], "hid", "gt")).toBe("10");
+        expect(HistoryFilters.getFilterValue(filterTexts[0], "hid", "lt")).toBe("100");
+        expect(HistoryFilters.getFilterValue(filterTexts[0], "tag")).toBe("first");
+        expect(HistoryFilters.getFilterValue(filterTexts[0], "deleted")).toBe("False");
+        expect(HistoryFilters.getFilterValue(filterTexts[0], "visible")).toBe("TRUE");
+        expect(HistoryFilters.getFilterValue(filterTexts[1], "hid", "gt")).toBe("10");
+        expect(HistoryFilters.getFilterValue(filterTexts[1], "create_time", "gt")).toBe("2021-01-01");
     });
     test("parse filter text as entries", () => {
         filterTexts.forEach((filterText) => {
-            const filters = getFilters(filterText);
+            const filters = HistoryFilters.getFilters(filterText);
             expect(filters[0][0]).toBe("name");
             expect(filters[0][1]).toBe("name of item");
             expect(filters[1][0]).toBe("hid_gt");
@@ -62,7 +73,7 @@ describe("filtering", () => {
     });
     test("parse filter text as query dictionary", () => {
         filterTexts.forEach((filterText) => {
-            const queryDict = getQueryDict(filterText);
+            const queryDict = HistoryFilters.getQueryDict(filterText);
             expect(queryDict["name-contains"]).toBe("name of item");
             expect(queryDict["hid-gt"]).toBe("10");
             expect(queryDict["hid-lt"]).toBe("100");
@@ -88,20 +99,20 @@ describe("filtering", () => {
             visible: true,
         };
         filterTexts.forEach((filterText) => {
-            const filters = getFilters(filterText);
-            expect(testFilters(filters, { ...item })).toBe(true);
-            expect(testFilters(filters, { ...item, hid: 10 })).toBe(false);
-            expect(testFilters(filters, { ...item, hid: 100 })).toBe(false);
-            expect(testFilters(filters, { ...item, hid: 99 })).toBe(true);
-            expect(testFilters(filters, { ...item, state: "error" })).toBe(false);
-            expect(testFilters(filters, { ...item, create_time: "2021-01-01" })).toBe(false);
-            expect(testFilters(filters, { ...item, create_time: "2021-01-02" })).toBe(true);
-            expect(testFilters(filters, { ...item, update_time: "2022-01-01" })).toBe(false);
-            expect(testFilters(filters, { ...item, update_time: "2021-12-31" })).toBe(true);
-            expect(testFilters(filters, { ...item, tags: ["second"] })).toBe(false);
-            expect(testFilters(filters, { ...item, visible: false })).toBe(false);
-            expect(testFilters(filters, { ...item, deleted: true })).toBe(false);
-            expect(testFilters(filters, { ...item, deleted: "nottrue" })).toBe(true);
+            const filters = HistoryFilters.getFilters(filterText);
+            expect(HistoryFilters.testFilters(filters, { ...item })).toBe(true);
+            expect(HistoryFilters.testFilters(filters, { ...item, hid: 10 })).toBe(false);
+            expect(HistoryFilters.testFilters(filters, { ...item, hid: 100 })).toBe(false);
+            expect(HistoryFilters.testFilters(filters, { ...item, hid: 99 })).toBe(true);
+            expect(HistoryFilters.testFilters(filters, { ...item, state: "error" })).toBe(false);
+            expect(HistoryFilters.testFilters(filters, { ...item, create_time: "2021-01-01" })).toBe(false);
+            expect(HistoryFilters.testFilters(filters, { ...item, create_time: "2021-01-02" })).toBe(true);
+            expect(HistoryFilters.testFilters(filters, { ...item, update_time: "2022-01-01" })).toBe(false);
+            expect(HistoryFilters.testFilters(filters, { ...item, update_time: "2021-12-31" })).toBe(true);
+            expect(HistoryFilters.testFilters(filters, { ...item, tags: ["second"] })).toBe(false);
+            expect(HistoryFilters.testFilters(filters, { ...item, visible: false })).toBe(false);
+            expect(HistoryFilters.testFilters(filters, { ...item, deleted: true })).toBe(false);
+            expect(HistoryFilters.testFilters(filters, { ...item, deleted: "nottrue" })).toBe(true);
         });
     });
     test("Parsing & sync of filter settings", () => {
@@ -120,14 +131,14 @@ describe("filtering", () => {
         };
         // iterate through filterTexts and compare with parsedFilterSettings
         filterTexts.forEach((filterText) => {
-            expect(toAlias(getFilters(filterText))).toEqual(parsedFilterSettings);
+            expect(HistoryFilters.toAlias(HistoryFilters.getFilters(filterText))).toEqual(parsedFilterSettings);
         });
     });
     test("named tag (hash) conversion", () => {
-        const filters = getFilters("tag:#test");
+        const filters = HistoryFilters.getFilters("tag:#test");
         expect(filters[0][0]).toBe("tag");
         expect(filters[0][1]).toBe("#test");
-        const queryDict = getQueryDict("tag:#test");
+        const queryDict = HistoryFilters.getQueryDict("tag:#test");
         expect(queryDict["tag"]).toBe("name:test");
     });
 });
diff --git a/client/src/utils/filtering.ts b/client/src/utils/filtering.ts
new file mode 100644
index 00000000000..5ea02047fb8
--- /dev/null
+++ b/client/src/utils/filtering.ts
@@ -0,0 +1,380 @@
+/**
+ * This utility function is used to parse and convert the user inputted filter text in `QUERY:VALUE` format to a query
+ * object that can be sent to the server.
+ * User input text is split by space and each filter can be in the following format:
+ * `QUERY[:, < or >]VALUE`
+ * QUERY may only contain alphanumeric characters, underscores, and dashes. Quotation marks are only allowed in `VALUE`
+ * for values that contain spaces.
+ * Each query key has a default suffix defined e.g. name:foo will be converted to name-eq:foo.
+ * Comparison aliases are allowed converting e.g. '>' to '-gt' and '<' to '-lt'.
+ */
+
+type Converter<T> = (value: T) => T;
+type Handler<T> = (v: T, q: T) => boolean;
+
+/** Add comparison aliases i.e. '*>value' is converted to '*_gt=value' */
+const defaultValidAliases = [
+    [">", "_gt"],
+    ["<", "_lt"],
+];
+
+const operatorForAlias: Record<string, string> = {
+    lt: "<",
+    le: "<=",
+    ge: ">=",
+    gt: ">",
+    eq: ":",
+};
+
+/** Converts user input to backend compatible date
+ * @param {string} value
+ * @returns {Number} seconds since epoch
+ * */
+export function toDate(value: string): number {
+    return Date.parse(value) / 1000;
+}
+
+/** Converts user input for case-insensitive filtering
+ * @param {string} value
+ * @returns {string} Lowercase value
+ * */
+export function toLower<T>(value: T): string {
+    return String(value).toLowerCase();
+}
+
+/** Converts user input to boolean
+ * @param {string} value
+ * @returns {boolean} true if value is 'true', false if value is 'false'
+ * */
+export function toBool<T>(value: T): boolean {
+    return toLower(value) === "true";
+}
+
+/** Converts user input to lower case and strips quotation marks
+ * @param {string} value
+ * @returns {string} Lowercase value without quotation marks
+ * */
+export function toLowerNoQuotes<T>(value: T): string {
+    return toLower(value).split("'").join("");
+}
+
+/** Converts name tags starting with '#' to 'name:'
+ * @param {string} value
+ * @returns {string} Lowercase value with 'name:' replaced with '#'
+ * */
+export function expandNameTag(value: string | object): string {
+    if (value && typeof value === "string" && value.startsWith("#")) {
+        value = value.replace("#", "name:");
+    }
+    return toLower(value);
+}
+
+/** Converts string alias to string operator, e.g.: 'gt' to '>'
+ * @param alias
+ * @returns Arithmetic operator, e.g.: '>'
+ * */
+export function getOperatorForAlias(alias: string): string {
+    return operatorForAlias[alias];
+}
+
+type HandlerReturn<T> = {
+    attribute: string;
+    converter?: Converter<T>;
+    query: string;
+    handler: Handler<T>;
+};
+
+/**
+ * Checks if a query value is equal to the item value
+ * @param {string} attribute of the content item
+ * @param {string} [query] parameter if the attribute does not match the server query key
+ * @param {function} [converter] if item attribute value has to be transformed e.g. to a date.
+ */
+export function equals<T>(attribute: string, query?: string, converter?: Converter<T>): HandlerReturn<T> {
+    return {
+        attribute,
+        converter,
+        query: query || `${attribute}-eq`,
+        handler: (v: T, q: T) => {
+            if (converter) {
+                v = converter(v);
+                q = converter(q);
+            }
+            return toLower(v) === toLower(q);
+        },
+    };
+}
+
+/**
+ * Checks if a query value is part of the item value
+ * @param {string} attribute of the content item
+ * @param {string} [query] parameter if the attribute does not match the server query key
+ * @param {function} [converter] if item attribute value has to be transformed e.g. to a date.
+ */
+export function contains<T>(attribute: string, query?: string, converter?: Converter<T>): HandlerReturn<T> {
+    return {
+        attribute,
+        converter,
+        query: query || `${attribute}-contains`,
+        handler: (v: T, q: T) => {
+            if (converter) {
+                v = converter(v);
+                q = converter(q);
+            }
+            return toLower(v).includes(toLower(q));
+        },
+    };
+}
+
+/**
+ * Checks if a value is greater or smaller than the item value
+ * @param {string} attribute of the content item
+ * @param {string} variant specifying the comparison operation e.g. le(<=) and gt(>)
+ * @param {function} [converter] if item attribute value has to be transformed e.g. to a date.
+ */
+export function compare<T>(attribute: string, variant: string, converter?: Converter<T>): HandlerReturn<T> {
+    return {
+        attribute,
+        converter,
+        query: `${attribute}-${variant}`,
+        handler: (v: T, q: T) => {
+            if (converter) {
+                v = converter(v);
+                q = converter(q);
+            }
+            switch (variant) {
+                case "lt":
+                    return v < q;
+                case "le":
+                    return v <= q;
+                case "ge":
+                    return v >= q;
+                case "gt":
+                    return v > q;
+                default:
+                    return false;
+            }
+        },
+    };
+}
+
+export default class Filtering<T> {
+    validFilters: Record<string, HandlerReturn<T>>;
+    validAliases: string[][];
+    useDefaultFilters: boolean;
+    defaultFilters: Record<string, boolean> = {
+        deleted: false,
+        visible: true,
+    };
+
+    constructor(validFilters: Record<string, HandlerReturn<T>>, useDefaultFilters = true, validAliases?: string[][]) {
+        this.validFilters = validFilters;
+        this.useDefaultFilters = useDefaultFilters;
+        this.validAliases = validAliases || defaultValidAliases;
+    }
+
+    /** Returns normalize defaults by adding the operator to the key identifier
+     * @returns {Object} Dictionary with query key and values for default filters
+     * */
+    getDefaults(): Record<string, boolean> {
+        const normalized: Record<string, boolean> = {};
+        Object.entries(this.defaultFilters).forEach(([key, value]) => {
+            normalized[`${key}:`] = value;
+        });
+        return normalized;
+    }
+
+    /** Returns true if default filter values are not changed
+     * @param {Object} filterSettings Object containing filter settings
+     * @returns {Boolean} True if default filter values are not changed
+     * **/
+    containsDefaults(filterSettings: Record<string, string | boolean>): boolean {
+        const normalized = this.getDefaults();
+        let hasDefaults = true;
+        for (const key in normalized) {
+            const value = String(filterSettings[key]).toLowerCase();
+            const normalizedValue = String(normalized[key]).toLowerCase();
+            if (value !== normalizedValue) {
+                hasDefaults = false;
+                break;
+            }
+        }
+        return hasDefaults;
+    }
+
+    /** Build a text filter from filter settings
+     * @param {Object} filterSettings Object containing filter settings
+     * @returns {String} Parsed filter text string
+     * */
+    getFilterText(filterSettings: Record<string, string | boolean>): string {
+        const normalized = this.getDefaults();
+        const hasDefaults = this.containsDefaults(filterSettings);
+
+        let newFilterText = "";
+        Object.entries(filterSettings).forEach(([key, value]) => {
+            const skipDefault = hasDefaults && normalized[key] !== undefined;
+            if (!skipDefault && value !== undefined && value !== "") {
+                if (newFilterText) {
+                    newFilterText += " ";
+                }
+                if (String(value).includes(" ")) {
+                    value = `'${value}'`;
+                }
+                newFilterText += `${key}${value}`;
+            }
+        });
+        return newFilterText;
+    }
+
+    /** Parses single text input into a dict of field->value pairs.
+     * @param {string} filterText Raw filter text string
+     * @returns {object} Filters as dict of field->value pairs
+     * */
+    getFilters(filterText: string): [string, T][] {
+        const pairSplitRE = /[^\s']+(?:'[^']*'[^\s']*)*|(?:'[^']*'[^\s']*)+/g;
+        const matches = filterText.match(pairSplitRE);
+        let result: Record<string, any> = {};
+        let hasMatches = false;
+        if (matches) {
+            matches.forEach((pair) => {
+                const elgRE = /(\S+)([:><])(.+)/g;
+                const elgMatch = elgRE.exec(pair);
+                if (elgMatch) {
+                    let field = elgMatch[1];
+                    const elg = elgMatch[2];
+                    const value = elgMatch[3];
+                    // replace alias for less and greater symbol
+                    for (const [alias, substitute] of this.validAliases) {
+                        if (elg === alias) {
+                            field = `${field}${substitute}`;
+                            break;
+                        }
+                    }
+                    // replaces dashes with underscores in query field names
+                    const normalizedField = field.split("-").join("_");
+                    if (this.validFilters[normalizedField]) {
+                        // removes quotation and applies lower-case to filter value
+                        result[normalizedField] = toLowerNoQuotes(value);
+                        hasMatches = true;
+                    }
+                }
+            });
+        }
+        // assume name matching if no filter key has been matched
+        if (!hasMatches && filterText.length > 0) {
+            result["name"] = filterText;
+        }
+        // check if any default filter keys have been used
+        let hasDefaults = false;
+        for (const defaultKey in this.defaultFilters) {
+            if (result[defaultKey]) {
+                hasDefaults = true;
+                break;
+            }
+        }
+        // use default filters if none of the default filters has been explicitly specified
+        if (!hasDefaults && this.useDefaultFilters) {
+            result = { ...result, ...this.defaultFilters };
+        }
+
+        return Object.entries(result);
+    }
+
+    /** Returns a dictionary resembling filterSettings (for HistoryFilters):
+     * e.g.: Unlike getFilters or getQueryDict, this maintains "hid>":"3" instead
+     *       of changing it to "hid-gt":"3"
+     * Only used to sync filterSettings (in HistoryFilters)
+     * @param {Object} filters Parsed filterText from getFilters()
+     * @returns {Object} filterSettings
+     */
+    toAlias(filters: [string, T][]): object {
+        const result: Record<string, T> = {};
+        for (const [key, value] of filters) {
+            let hasAlias = false;
+            for (const [alias, substitute] of this.validAliases) {
+                if (key.endsWith(substitute)) {
+                    const keyPrefix = key.slice(0, -substitute.length);
+                    result[`${keyPrefix}${alias}`] = value;
+                    hasAlias = true;
+                    break;
+                }
+            }
+            if (!hasAlias) {
+                result[`${key}:`] = value;
+            }
+        }
+        return result;
+    }
+
+    /** Returns a dictionary with query key and values.
+     * @param {String} filterText Raw filter text string
+     * @returns {Object} Dictionary with query key and values
+     */
+    getQueryDict(filterText: string): object {
+        const queryDict: Record<string, T> = {};
+        const filters = this.getFilters(filterText);
+        for (const [key, value] of filters) {
+            const query = this.validFilters[key].query;
+            const converter = this.validFilters[key].converter;
+            queryDict[query] = converter ? converter(value) : value;
+        }
+        return queryDict;
+    }
+
+    /** Returns query string from filter text.
+     * @param {String} filterText Raw filter text string to be parsed
+     * @returns {String} Parsed query string
+     * */
+    getQueryString(filterText: string): string {
+        const filterDict = this.getQueryDict(filterText);
+        return Object.entries(filterDict)
+            .map(([f, v]) => `q=${f}&qv=${v}`)
+            .join("&");
+    }
+
+    /** Check the value of a particular filter.
+     * @param {String} filterText Raw filter text string
+     * @param {String} filterName Filter key to check
+     * @param {String | Object | Boolean} filterValue The filter value to check
+     * @returns {Boolean} True if the filter is set to the given value
+     * */
+    checkFilter<T>(filterText: string, filterName: string, filterValue: T): boolean {
+        const testValue = this.getFilterValue(filterText, filterName);
+        return toLowerNoQuotes(testValue) === toLowerNoQuotes(filterValue);
+    }
+
+    /** Get the value of a particular filter from filterText.
+     * @param filterText Raw filter text string
+     * @param filterName Filter key to check
+     * @param [alias="eq"] String alias for filter operator, e.g.:"lt"
+     * @returns The filterValue for the filter
+     * */
+    getFilterValue(filterText: string, filterName: string, alias = "eq"): string | boolean {
+        const op = getOperatorForAlias(alias);
+        const reString = `${filterName}(?:${op}|[-|_]${alias}:)(?:'([^']*[^\\s']*)'|(\\S+))`;
+        const re = new RegExp(reString);
+        const reMatch = re.exec(filterText);
+        let filterVal = null;
+        if (reMatch) {
+            filterVal = reMatch[1] || reMatch[2];
+        }
+        return filterVal || this.defaultFilters[filterName];
+    }
+
+    /** Test if an item passes all filters.
+     * @param {Object} filters Parsed in key-value pairs from getFilters()
+     * @param {Object} item Item to test against the filters
+     * @returns {Boolean} True if the item passes all filters
+     * */
+    testFilters(filters: [string, T][], item: Record<string, T>): boolean {
+        for (const [key, filterValue] of filters) {
+            const filterAttribute = this.validFilters[key].attribute;
+            const filterHandler = this.validFilters[key].handler;
+            const itemValue = item[filterAttribute];
+            if (!filterHandler(itemValue, filterValue)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/client/src/utils/localization.js b/client/src/utils/localization.js
index d017fecd35f..e8ceb519b6c 100644
--- a/client/src/utils/localization.js
+++ b/client/src/utils/localization.js
@@ -1,54 +1,54 @@
-// eslint-disable-next-line no-undef
-define(["i18n!nls/locale"], function (localeStrings) {
-    /**
-     * @param {String} strToLocalize
-     * @returns
-     */
-    var localize = function (strToLocalize) {
-        return localeStrings[strToLocalize] || strToLocalize;
-    };
+import localeStrings from "i18n!nls/locale";
 
-    localize.cacheNonLocalized = false;
+/**
+ * @param {String} strToLocalize
+ * @returns
+ */
 
-    localize._setUserLocale = function _setUserLocale(user, config) {
-        const global_locale =
-            config.default_locale && config.default_locale != "auto" ? config.default_locale.toLowerCase() : false;
+let localeStringsSubset = [];
 
-        let extra_user_preferences = {};
-        if (user && user.attributes.preferences && "extra_user_preferences" in user.attributes.preferences) {
-            extra_user_preferences = JSON.parse(user.attributes.preferences.extra_user_preferences);
+export function localize(strToLocalize) {
+    return localeStringsSubset[strToLocalize] || strToLocalize;
+}
+
+export function _setUserLocale(user, config) {
+    const global_locale =
+        config.default_locale && config.default_locale != "auto" ? config.default_locale.toLowerCase() : false;
+
+    let extra_user_preferences = {};
+    if (user && user.attributes.preferences && "extra_user_preferences" in user.attributes.preferences) {
+        extra_user_preferences = JSON.parse(user.attributes.preferences.extra_user_preferences);
+    }
+
+    let user_locale =
+        "localization|locale" in extra_user_preferences
+            ? extra_user_preferences["localization|locale"].toLowerCase()
+            : false;
+
+    if (user_locale == "auto") {
+        user_locale = false;
+    }
+
+    const nav_locale =
+        typeof navigator === "undefined"
+            ? "__root"
+            : (navigator.language || navigator.userLanguage || "__root").toLowerCase();
+
+    const locale = user_locale || nav_locale || global_locale;
+
+    sessionStorage.setItem("currentLocale", locale);
+}
+
+export function _getUserLocale(user, config) {
+    let locale = null;
+    if (Object.prototype.hasOwnProperty.call(localeStrings, "__root")) {
+        locale = sessionStorage.getItem("currentLocale");
+        if (locale) {
+            localeStringsSubset =
+                localeStrings["__" + locale] || localeStrings["__" + locale.split("-")[0]] || localeStrings.__root;
         }
+    }
+    return locale;
+}
 
-        let user_locale =
-            "localization|locale" in extra_user_preferences
-                ? extra_user_preferences["localization|locale"].toLowerCase()
-                : false;
-
-        if (user_locale == "auto") {
-            user_locale = false;
-        }
-
-        const nav_locale =
-            typeof navigator === "undefined"
-                ? "__root"
-                : (navigator.language || navigator.userLanguage || "__root").toLowerCase();
-
-        const locale = user_locale || nav_locale || global_locale;
-
-        sessionStorage.setItem("currentLocale", locale);
-    };
-
-    localize._getUserLocale = function _getUserLocale(user, config) {
-        let locale = null;
-        if (Object.prototype.hasOwnProperty.call(localeStrings, "__root")) {
-            locale = sessionStorage.getItem("currentLocale");
-            if (locale) {
-                localeStrings =
-                    localeStrings["__" + locale] || localeStrings["__" + locale.split("-")[0]] || localeStrings.__root;
-            }
-        }
-        return locale;
-    };
-
-    return localize;
-});
+export default localize;
diff --git a/client/src/utils/logout.js b/client/src/utils/logout.js
index efa01431edf..75742b7fefe 100644
--- a/client/src/utils/logout.js
+++ b/client/src/utils/logout.js
@@ -1,6 +1,6 @@
 import axios from "axios";
 import { getGalaxyInstance } from "app";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 
 /**
  * Handles user logout.  Invalidates the current session, checks to see if we
@@ -12,7 +12,7 @@ export function userLogout(logoutAll = false) {
     const session_csrf_token = Galaxy.session_csrf_token;
     const url = `/user/logout?session_csrf_token=${session_csrf_token}&logout_all=${logoutAll}`;
     axios
-        .get(safePath(url))
+        .get(withPrefix(url))
         .then((response) => {
             if (Galaxy.user) {
                 Galaxy.user.clearSessionStorage();
@@ -22,9 +22,9 @@ export function userLogout(logoutAll = false) {
                 const provider = localStorage.getItem("galaxy-provider");
                 if (provider) {
                     localStorage.removeItem("galaxy-provider");
-                    return axios.get(safePath(`/authnz/logout?provider=${provider}`));
+                    return axios.get(withPrefix(`/authnz/logout?provider=${provider}`));
                 }
-                return axios.get(safePath("/authnz/logout"));
+                return axios.get(withPrefix("/authnz/logout"));
             } else {
                 // Otherwise pass through the initial logout response
                 return response;
@@ -34,7 +34,7 @@ export function userLogout(logoutAll = false) {
             if (response.data?.redirect_uri) {
                 window.top.location.href = response.data.redirect_uri;
             } else {
-                window.top.location.href = safePath(post_user_logout_href);
+                window.top.location.href = withPrefix(post_user_logout_href);
             }
         });
 }
@@ -52,5 +52,5 @@ export function userLogoutClient() {
     const Galaxy = getGalaxyInstance();
     Galaxy.user?.clearSessionStorage();
     const post_user_logout_href = Galaxy.config.post_user_logout_href;
-    window.top.location.href = safePath(post_user_logout_href);
+    window.top.location.href = withPrefix(post_user_logout_href);
 }
diff --git a/client/src/utils/mountVueComponent.js b/client/src/utils/mountVueComponent.js
index 8ef37f8e9dc..02efe8e2e5b 100644
--- a/client/src/utils/mountVueComponent.js
+++ b/client/src/utils/mountVueComponent.js
@@ -33,8 +33,9 @@ export const mountVueComponent = (ComponentDefinition) => {
 };
 
 export const appendVueComponent = ($el, ComponentDefinition, propsData = {}) => {
+    // TODO:  this doesn't append, it wipes out the element and replaces contents?
     const container = document.createElement("div");
-    $el.empty().append(container);
+    $el.replaceChildren(container);
     const component = Vue.extend(ComponentDefinition);
     const mountFn = (propsData, el) => new component({ propsData, el });
     return mountFn(propsData, container);
diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
index 9ec0762b59a..5b8a7a8120c 100644
--- a/client/src/utils/navigation/navigation.yml
+++ b/client/src/utils/navigation/navigation.yml
@@ -158,7 +158,7 @@ history_panel:
       info_button: '${_} .params-btn'
       tool_help_button: '${_} .fa.fa-question'
       rerun_button: '${_} .rerun-btn'
-      alltags: '${_} .alltags .ti-tags'
+      alltags: '${_} .stateless-tags .tag'
 
   # history content item
   content_item:
@@ -188,7 +188,7 @@ history_panel:
       # Action buttons...
       download_button: '${_} .download-btn'
       info_button: '${_} .params-btn'
-      alltags: '${_} .alltags .ti-tags'
+      alltags: '${_} .stateless-tags .tag'
       metadata_file_download: '${_} [data-description="download ${metadata_name}"]'
 
       dataset_operations_dropdown: '${_}  .dataset-actions'
@@ -202,18 +202,18 @@ history_panel:
       form: '${_} [data-description="edit form"]'
       name_input: '${_} [data-description="name input"]'
       annotation_input: '${_} [data-description="annotation input"]'
-      tags_input: '${_} .tags input'
+      tags_input: '${_} .stateless-tags button'
       save_button: '${_} [data-description="editor save button"]'
 
   # history tags
   tag_editor:
     selectors:
-      _: '${scope} .details .tags'
+      _: '${scope} .details .stateless-tags'
       toggle: '${_} .toggle-link'
-      display: '${_} .tag-area .tag-name'
+      display: '${_} .tag span'
       input: '${_} input'
-      tag_area: '${_} .tag-area'
-      tag_close_btn: '${_} .ti-icon-close'
+      tag_area: '${_} .multiselect__tags'
+      tag_close_btn: '${_} .tag-delete-button'
 
   multi_operations:
     selectors:
@@ -237,7 +237,8 @@ history_panel:
       title_input: '.dataset-collection-panel .controls .title input'
       subtitle: '.dataset-collection-panel .controls .title .subtitle'
       elements_warning: '.dataset-collection-panel .controls .elements-warning'
-      tag_area_input: '.controls .tags-display .tags-input input'
+      tag_area_button: '.details .stateless-tags .multiselect button'
+      tag_area_input: '.details .stateless-tags .multiselect input'
       list_items: '.dataset-collection-panel .listing .content-item'
 
   selectors:
@@ -251,11 +252,11 @@ history_panel:
     contents: '.history-index .content-item'
     empty_message: '.empty-message'
     size: '.history-size'
-    tag_icon: '.actions .history-tag-btn'
-    tag_area: '.details .tags-display'
-    tag_area_input: '.details .tags-display .tags-input input'
-    tag_close_btn: '.tags-display .ti-icon-close'
-    tags: 'li.ti-tag.ti-valid .tag-name'
+    tag_area: '.details .stateless-tags'
+    tag_area_button: '.details .stateless-tags .multiselect button'
+    tag_area_input: '.details .stateless-tags .multiselect input'
+    tag_close_btn: '.tags-display .tag-delete-button'
+    tags: '.tag span'
 
     annotation_icon: '.actions .history-annotate-btn'
     annotation_area: '.details .history-annotation'
@@ -419,6 +420,28 @@ history_export:
     export_button: '.export-button'
     success_message: '.history-export-component .alert-success'
 
+history_export_tasks:
+  selectors:
+    direct_download: '.direct-download-btn'
+    file_source_tab: '.tab-export-to-file'
+    remote_file_name_input: '#file-source-tab #name'
+    toggle_options_link: '#toggle-options-link'
+    export_format_selector: '#format-selector'
+    select_format:
+        type: xpath
+        selector: '//select[@id="format-selector"]/option[@value="${format}"]'
+
+last_export_record:
+  selectors:
+    details: '.export-record-details'
+    preparing_export: '.export-record-details .loading-icon'
+    export_format: '.record-archive-format'
+    up_to_date_icon: '.record-up-to-date-icon'
+    outdated_icon: '.record-outdated-icon'
+    expiration_warning_icon: '.record-expiration-warning-icon'
+    download_btn: '.record-download-btn'
+    reimport_btn: '.record-reimport-btn'
+
 history_import:
   selectors:
     radio_button_remote_files: '.history-import-component .fa-folder-open'
@@ -463,7 +486,7 @@ tool_form:
     options: '.tool-dropdown'
     execute: 'button#execute'
     parameter_div: 'div.ui-form-element[id="form-element-${parameter}"]'
-    parameter_checkbox: 'div.ui-form-element[id="form-element-${parameter}"] .ui-switch div'
+    parameter_checkbox: 'div.ui-form-element[id="form-element-${parameter}"] .ui-switch'
     parameter_input: 'div.ui-form-element[id="form-element-${parameter}"] .ui-input'
     parameter_textarea: 'div.ui-form-element[id="form-element-${parameter}"] textarea'
     reference: '.formatted-reference'
@@ -524,6 +547,8 @@ trs_import:
     select_server:
       type: xpath
       selector: "//a[contains(@class, 'dropdown-item') and text() = '${server}']"
+    url_input: "#trs-import-url-input"
+    url_import_button: "#trs-url-import-button"
 
 workflow_run:
   selectors:
@@ -566,6 +591,10 @@ workflow_editor:
     workflow_link:
       type: xpath
       selector: '//a[contains(., "${workflow_title}")]'
+    insert_steps:
+      type: xpath
+      selector: >
+        //a/span[text()='${workflow_title}']/following-sibling::span[@title='Insert individual steps.']
     connect_icon: 'div.ui-form-element[id="form-element-${name}"] .ui-form-connected-icon'
     collapse_icon: 'div.ui-form-element[id="form-element-${name}"] .ui-form-collapsible-icon'
     edit_subworkflow: 'button[title="Edit this Subworkflow. You will need to upgrade this Workflow Step afterwards."]'
@@ -575,11 +604,11 @@ workflow_editor:
     label_input:
       type: xpath
       selector: >
-        //div[@id='form-element-__label' and not(ancestor::div[contains(@style,'display: none')])]//input
+        //div[@id='form-element-__label']//input
     annotation_input:
       type: xpath
       selector: >
-        //div[@id='form-element-__annotation' and not(ancestor::div[contains(@style,'display: none')])]//textarea
+        //div[@id='form-element-__annotation']//textarea
     configure_output:
       type: xpath
       selector: >
@@ -587,7 +616,7 @@ workflow_editor:
     label_output:
       type: xpath
       selector: >
-        //div[@id='form-element-__label__${output}' and not(ancestor::div[contains(@style,'display: none')])]//input
+        //div[@id='form-element-__label__${output}']//input
     rename_output:
       type: xpath
       selector: >
@@ -596,7 +625,7 @@ workflow_editor:
       type: xpath
       selector: >
         //div[@data-label='Change datatype' and not(ancestor::div[contains(@style,'display: none')])]//span[contains(@class, 'select2-chosen')]
-    select_dataype_text_search:
+    select_datatype_text_search:
       type: xpath
       selector: >
         //div[@class="select2-search" and not(ancestor::div[contains(@style,'display: none')])]//input
@@ -607,13 +636,13 @@ workflow_editor:
     add_tags:
       type: xpath
       selector: >
-        //div[@data-label='Add Tags' and not(ancestor::div[contains(@style,'display: none')])]//input
+        //div[@data-label='Add Tags']//input
     remove_tags:
       type: xpath
       selector: >
-        //div[@data-label='Remove Tags' and not(ancestor::div[contains(@style,'display: none')])]//input
+        //div[@data-label='Remove Tags']//input
     tool_version_button: ".tool-versions"
-    connector_for: "div[output-handle-id='${source_id}'][input-handle-id='${sink_id}']"
+    connector_for: "#connection-${sink_id}-${source_id}"
     connector_destroy_callout: '.delete-terminal'
     save_button: '.editor-button-save'
     state_modal_body: '.state-upgrade-modal'
@@ -917,4 +946,3 @@ job_details:
       type: xpath
       selector: '//td[@id="galaxy-tool-id"][normalize-space(text()) = "${tool_id}"]'
     tool_exit_code: '#exit-code'
-
diff --git a/client/src/utils/redirect.test.js b/client/src/utils/redirect.test.js
deleted file mode 100644
index 4aecfb2b8e3..00000000000
--- a/client/src/utils/redirect.test.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { safePath } from "./redirect";
-import { getAppRoot } from "onload/loadConfig";
-
-jest.mock("onload/loadConfig");
-getAppRoot.mockImplementation(() => "/prefix");
-
-describe("test path handling", () => {
-    it("route prefix changes", async () => {
-        // test routes
-        expect(safePath()).toEqual(undefined);
-        expect(safePath("http://")).toEqual("http://");
-        expect(safePath("/")).toEqual("/prefix/");
-        expect(safePath("/home")).toEqual("/prefix/home");
-        // ensure that it can only be called once
-        expect(safePath(safePath("/home"))).toEqual("/prefix/prefix/home");
-    });
-});
diff --git a/client/src/utils/redirect.test.ts b/client/src/utils/redirect.test.ts
new file mode 100644
index 00000000000..4442119ac21
--- /dev/null
+++ b/client/src/utils/redirect.test.ts
@@ -0,0 +1,15 @@
+import { withPrefix } from "./redirect";
+import { getAppRoot } from "@/onload/loadConfig";
+
+jest.mock("@/onload/loadConfig");
+
+test("route prefix changes", async () => {
+    jest.mocked(getAppRoot).mockReturnValue("/prefix");
+    // test routes
+    expect(withPrefix("http://")).toEqual("http://");
+    expect(withPrefix("/")).toEqual("/prefix/");
+    expect(withPrefix("/home")).toEqual("/prefix/home");
+    // ensure that it can only be called once
+    expect(withPrefix(withPrefix("/home"))).toEqual("/prefix/prefix/home");
+    // This doesn't do what it looks like it should do?
+});
diff --git a/client/src/utils/redirect.js b/client/src/utils/redirect.ts
similarity index 77%
rename from client/src/utils/redirect.js
rename to client/src/utils/redirect.ts
index bc59649ad6a..3b074309300 100644
--- a/client/src/utils/redirect.js
+++ b/client/src/utils/redirect.ts
@@ -1,8 +1,8 @@
-import { getAppRoot } from "onload/loadConfig";
+import { getAppRoot } from "@/onload/loadConfig";
 
 // Simple redirect, only here to make testing easier
-export function redirectToUrl(url) {
-    window.location = url;
+export function redirectToUrl(url: string) {
+    window.location.assign(url);
 }
 
 // separated purely to make testing easier
@@ -13,20 +13,20 @@ export function reloadPage() {
 const slashCleanup = /(\/)+/g;
 /**
  * Prepends the configured app root to given url
- * @param {String} path
+ * @param path
  * @returns The relative URL path with the configured appRoot.
  */
-export function prependPath(path) {
+export function prependPath(path: string) {
     const root = getAppRoot();
     return `${root}/${path}`.replace(slashCleanup, "/");
 }
 
 /**
  * Returns the absolute URL path for this server given a relative path.
- * @param {String} path
+ * @param path
  * @returns The absolute URL path.
  */
-export function absPath(path) {
+export function absPath(path: string) {
     // Root path here may be '/' or '/galaxy' for example.  we always append the
     // base '/' and then clean up duplicates.
     const relativePath = `/${hasRoot(path) ? path : prependPath(path)}`.replace(slashCleanup, "/");
@@ -36,10 +36,10 @@ export function absPath(path) {
 
 /**
  * (Safely) Prepends the configured app root to given url
- * @param {String} path
+ * @param path
  * @returns The relative URL or original path.
  */
-export function safePath(path) {
+export function withPrefix(path: string) {
     if (path && path.startsWith("/")) {
         return prependPath(path);
     }
@@ -48,9 +48,9 @@ export function safePath(path) {
 
 /**
  * Checks if the path already has the app root.
- * @param {String} path
+ * @param path
  * @returns true if the given path starts with the app root.
  */
-function hasRoot(path) {
+function hasRoot(path: string) {
     return path.startsWith(getAppRoot());
 }
diff --git a/client/src/utils/serverPath.ts b/client/src/utils/serverPath.ts
index 6999f11ee1d..4c58dca9e47 100644
--- a/client/src/utils/serverPath.ts
+++ b/client/src/utils/serverPath.ts
@@ -1,3 +1,10 @@
+/**
+ * Returns the path of the current or given URL.
+ *
+ * @param {string} [rawUrl=window.location.href]
+ * @returns {string}
+ */
+
 export function serverPath(rawUrl: string = window.location.href): string {
     const url = new URL(rawUrl);
     return url.pathname;
diff --git a/client/src/utils/url.js b/client/src/utils/url.js
index 98e16a2e56f..df8c3662971 100644
--- a/client/src/utils/url.js
+++ b/client/src/utils/url.js
@@ -1,13 +1,12 @@
 import axios from "axios";
-import { safePath } from "utils/redirect";
+import { withPrefix } from "utils/redirect";
 import { rethrowSimple } from "utils/simple-error";
 
 export async function urlData({ url, headers, params }) {
     try {
-        console.debug("Requesting data from: ", url);
         headers = headers || {};
         params = params || {};
-        const { data } = await axios.get(safePath(url), { headers, params });
+        const { data } = await axios.get(withPrefix(url), { headers, params });
         return data;
     } catch (e) {
         rethrowSimple(e);
diff --git a/client/src/viz/tools.js b/client/src/viz/tools.js
index 53799f0f597..5fb54fe1fa4 100644
--- a/client/src/viz/tools.js
+++ b/client/src/viz/tools.js
@@ -3,7 +3,7 @@
  */
 import _ from "underscore";
 import $ from "jquery";
-import d3 from "d3";
+import * as d3 from "d3";
 import Backbone from "backbone";
 import { getAppRoot } from "onload/loadConfig";
 import util from "viz/trackster/util";
diff --git a/client/tests/jest/helpers.js b/client/tests/jest/helpers.js
index 429f3702e9d..94612f2f0cc 100644
--- a/client/tests/jest/helpers.js
+++ b/client/tests/jest/helpers.js
@@ -146,7 +146,13 @@ export const showAll = (vm) => {
 
 // waits n milliseconds and then promise resolves
 // usage: await wait(500);
-export const wait = (n) => timer(n).pipe(take(1)).toPromise();
+export const wait = (n) => {
+    return new Promise((resolve) => {
+        setTimeout(() => {
+            resolve();
+        }, n);
+    });
+};
 
 // Gets a localVue with custom directives
 export function getLocalVue(instrumentLocalization = false) {
diff --git a/client/tests/jest/jest-raw-loader.js b/client/tests/jest/jest-raw-loader.js
new file mode 100644
index 00000000000..3ef7c744106
--- /dev/null
+++ b/client/tests/jest/jest-raw-loader.js
@@ -0,0 +1,3 @@
+module.exports = {
+  process: content => { return { code: "module.exports = " + JSON.stringify(content)}}
+};
diff --git a/client/tests/jest/jest.config.js b/client/tests/jest/jest.config.js
index 0e5f5934044..90d99bbb5dc 100644
--- a/client/tests/jest/jest.config.js
+++ b/client/tests/jest/jest.config.js
@@ -1,196 +1,50 @@
 const path = require("path");
+const { defaults: tsjPreset } = require("ts-jest/presets");
 
 // For a detailed explanation regarding each configuration property, visit:
 // https://jestjs.io/docs/en/configuration.html
 
-const modulesToTransform = ["bootstrap-vue", "rxjs", "@hirez_io", "winbox", "pretty-bytes"].join("|");
+const modulesToTransform = [
+    "bootstrap-vue",
+    "rxjs",
+    "@hirez_io",
+    "winbox",
+    "pretty-bytes",
+    "@fortawesome",
+    "openapi-typescript-fetch",
+].join("|");
 
 module.exports = {
-    // All imported modules in your tests should be mocked automatically
-    // automock: false,
-
-    // Stop running tests after `n` failures
-    // bail: 0,
-
-    // The directory where Jest should store its cached dependency information
-    // cacheDirectory: "/private/var/folders/gm/53ksmsz51njf80yl3snw6g500000gn/T/jest_dx",
-
-    // Automatically clear mock calls and instances between every test
+    preset: "ts-jest",
     clearMocks: true,
-
-    // Indicates whether the coverage information should be collected while executing the test
-    // collectCoverage: false,
-
-    // An array of glob patterns indicating a set of files for which coverage information should be collected
-    // collectCoverageFrom: undefined,
-
-    // The directory where Jest should output its coverage files
     coverageDirectory: "coverage",
-
-    // An array of regexp pattern strings used to skip coverage collection
-    // coveragePathIgnorePatterns: [
-    //   "/node_modules/"
-    // ],
-
-    // A list of reporter names that Jest uses when writing coverage reports
-    // coverageReporters: [
-    //   "json",
-    //   "text",
-    //   "lcov",
-    //   "clover"
-    // ],
-
-    // An object that configures minimum threshold enforcement for coverage results
-    // coverageThreshold: undefined,
-
-    // A path to a custom dependency extractor
-    // dependencyExtractor: undefined,
-
-    // Make calling deprecated APIs throw helpful error messages
-    // errorOnDeprecated: false,
-
-    // Force coverage collection from ignored files using an array of glob patterns
-    // forceCoverageMatch: [],
-
-    // A path to a module which exports an async function that is triggered once before all test suites
-    // globalSetup: undefined,
-
-    // A path to a module which exports an async function that is triggered once after all test suites
-    // globalTeardown: undefined,
-
-    // A set of global variables that need to be available in all test environments
     globals: { __webpack_public_path__: "" },
-
-    // The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
-    // maxWorkers: "50%",
-
-    // An array of directory names to be searched recursively up from the requiring module's location
-    // moduleDirectories: [
-    //   "node_modules"
-    // ],
-
-    // An array of file extensions your modules use
-    moduleFileExtensions: ["js", "json", "vue", "yml", "txt", "ts"],
-
-    modulePaths: ["<rootDir>/src/", "<rootDir>/node_modules/", "<rootDir>/tests/"],
-
-    // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
-    // Some of these should turn into true mocks, instead of this module name mapping hack.
+    moduleFileExtensions: ["js", "ts", "json", "vue", "yml", "txt"],
+    modulePaths: ["<rootDir>/src/", "<rootDir>/tests/", "<rootDir>/node_modules/", "./"],
     moduleNameMapper: {
+        "^d3(.*)$": "<rootDir>/node_modules/d3$1/dist/d3$1.min.js",
         "\\.(css|scss)$": "<rootDir>/tests/jest/__mocks__/style.js",
         "^@fontsource/.*": "<rootDir>/tests/jest/__mocks__/font.js",
         "^config$": "<rootDir>/tests/jest/__mocks__/config.js",
+        handsontable: "node_modules/handsontable/dist/handsontable.js",
         "utils/localization$": "<rootDir>/tests/jest/__mocks__/localization.js",
         "viz/trackster$": "<rootDir>/tests/jest/__mocks__/trackster.js",
         "rxjs/internal/scheduler/AsyncScheduler":
             "<rootDir>/node_modules/rxjs/dist/esm/internal/scheduler/AsyncScheduler.js",
+        "^@/(.*)$": "<rootDir>/src/$1",
+        "^@tests/(.*)$": "<rootDir>/tests/$1",
     },
-
-    // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
     modulePathIgnorePatterns: ["<rootDir>/src/.*/__mocks__"],
-
-    // Activates notifications for test results
-    // notify: false,
-
-    // An enum that specifies notification mode. Requires { notify: true }
-    // notifyMode: "failure-change",
-
-    // A preset that is used as a base for Jest's configuration
-    preset: "ts-jest",
-
-    // Run tests from one or more projects
-    // projects: undefined,
-
-    // Use this configuration option to add custom reporters to Jest
-    // reporters: undefined,
-
-    // Automatically reset mock state between every test
-    // resetMocks: false,
-
-    // Reset the module registry before running each individual test
-    // resetModules: false,
-
-    // A path to a custom resolver
-    // resolver: undefined,
-
-    // Automatically restore mock state between every test
-    // restoreMocks: false,
-
-    // The root directory that Jest should scan for tests and modules within
-    // This should be the galaxy `client` directory.
     rootDir: path.join(__dirname, "../../"),
-
-    // A list of paths to directories that Jest should use to search for files in
-    roots: ["<rootDir>/src", "<rootDir>/tests/jest/standalone/", "<rootDir>/docs/"],
-
-    // Allows you to use a custom runner instead of Jest's default test runner
-    // runner: "jest-runner",
-
-    // The paths to modules that run some code to configure or set up the testing environment before each test
-    // setupFiles: [],
-
-    // A list of paths to modules that run some code to configure or set up the testing framework before each test
+    roots: ["<rootDir>/src/", "<rootDir>/tests/jest/standalone/"],
     setupFilesAfterEnv: ["<rootDir>/tests/jest/jest.setup.js"],
-
-    // A list of paths to snapshot serializer modules Jest should use for snapshot testing
-    // snapshotSerializers: [],
-
-    // The test environment that will be used for testing
     testEnvironment: "jsdom",
-
-    // Options that will be passed to the testEnvironment
-    // testEnvironmentOptions: {},
-
-    // Adds a location field to test results
-    // testLocationInResults: false,
-
-    // The glob patterns Jest uses to detect test files
-    // testMatch: [
-    //   "**/__tests__/**/*.[jt]s?(x)",
-    //   "**/?(*.)+(spec|test).[tj]s?(x)"
-    // ],
-
-    // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
-    // testPathIgnorePatterns: [
-    //   "/node_modules/"
-    // ],
-
-    // The regexp pattern or array of patterns that Jest uses to detect test files
-    // testRegex: [],
-
-    // This option allows the use of a custom results processor
-    // testResultsProcessor: undefined,
-
-    // This option allows use of a custom test runner
-    // testRunner: "jasmine2",
-
-    // This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
-    // testURL: "http://localhost",
-
-    // Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
-    // timers: "real",
-
-    // A map from regular expressions to paths to transformers
     transform: {
-        // [`(${modulesToTransform}).+\\.js$`]: "vue-jest",
         "^.+\\.js$": "babel-jest",
-        ".*\\.(vue)$": "@vue/vue2-jest",
-        "\\.yml$": "yaml-jest",
-        "\\.txt$": "jest-raw-loader",
+        "^.*\\.(vue)$": "@vue/vue2-jest",
+        "^.+\\.ya?ml$": "<rootDir>/tests/jest/yaml-jest.js",
+        "^.+\\.txt$": "<rootDir>/tests/jest/jest-raw-loader.js",
+        ...tsjPreset.transform,
     },
-
-    // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
     transformIgnorePatterns: [`/node_modules/(?!${modulesToTransform})`],
-
-    // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
-    // unmockedModulePathPatterns: undefined,
-
-    // Indicates whether each individual test should be reported during the run
-    // verbose: undefined,
-
-    // An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
-    // watchPathIgnorePatterns: [],
-
-    // Whether to use watchman for file crawling
-    // watchman: true,
 };
diff --git a/client/tests/jest/jest.setup.js b/client/tests/jest/jest.setup.js
index 1db1263f650..474a5845a15 100644
--- a/client/tests/jest/jest.setup.js
+++ b/client/tests/jest/jest.setup.js
@@ -1,4 +1,9 @@
 import "@testing-library/jest-dom";
+import Vue from 'vue';
+
+// Set Vue to suppress production / devtools / etc. warnings
+Vue.config.productionTip = false;
+Vue.config.devtools = false;
 
 /* still don't understand what was invoking the following, but nothing should,
 and this makes the tag tests work correctly */
diff --git a/client/tests/jest/standalone/RuleDefinitions.test.ts b/client/tests/jest/standalone/RuleDefinitions.test.ts
index a8b09a3896e..901d2402dca 100644
--- a/client/tests/jest/standalone/RuleDefinitions.test.ts
+++ b/client/tests/jest/standalone/RuleDefinitions.test.ts
@@ -1,4 +1,4 @@
-import RuleDefs from "components/RuleBuilder/rule-definitions";
+import RuleDefs from "@/components/RuleBuilder/rule-definitions";
 import SPEC_TEST_CASES from "./rules_dsl_spec.yml";
 
 function applyRules(rules: Array<any>, data: Array<Array<string>>, sources: Array<number>) {
diff --git a/client/tests/jest/yaml-jest.js b/client/tests/jest/yaml-jest.js
new file mode 100644
index 00000000000..8e84063fe5b
--- /dev/null
+++ b/client/tests/jest/yaml-jest.js
@@ -0,0 +1,13 @@
+const transformer = require("yaml-jest").default
+
+const newTransformer = {
+  ...transformer,
+  process: function (...params) {
+    return {
+      code: transformer?.process(...params),
+      map: null,
+    }
+  },
+}
+
+module.exports = newTransformer
diff --git a/client/tests/qunit/test-data/json/datatypes.json b/client/tests/qunit/test-data/json/datatypes.json
index 8f70ad95be3..4fce3a3fda1 100644
--- a/client/tests/qunit/test-data/json/datatypes.json
+++ b/client/tests/qunit/test-data/json/datatypes.json
@@ -2,5 +2,6 @@
     "RData",
     "ab1",
     "affybatch",
-    "txt"
-]
\ No newline at end of file
+    "txt",
+    "tabular"
+]
diff --git a/client/tests/qunit/testBundle.js b/client/tests/qunit/testBundle.js
index a617c4d9896..2286b30def8 100644
--- a/client/tests/qunit/testBundle.js
+++ b/client/tests/qunit/testBundle.js
@@ -5,7 +5,6 @@
 import "./tests/galaxy_app_base_tests";
 import "./tests/jquery_plugin_tests";
 import "./tests/metrics_logger_tests";
-import "./tests/workflow_editor_tests";
 import "./tests/graph_tests";
 import "./tests/modal_tests";
 import "./tests/utils_tests";
diff --git a/client/tests/qunit/tests/workflow_editor_tests.js b/client/tests/qunit/tests/workflow_editor_tests.js
deleted file mode 100644
index 7d67f2282d1..00000000000
--- a/client/tests/qunit/tests/workflow_editor_tests.js
+++ /dev/null
@@ -1,1293 +0,0 @@
-/* global QUnit */
-import $ from "jquery";
-import { testDatatypesMapper } from "components/Datatypes/test_fixtures";
-import sinon from "sinon";
-import WorkflowNode from "components/Workflow/Editor/Node";
-import Terminals from "components/Workflow/Editor/modules/terminals";
-import { InputDragging, OutputDragging } from "components/Workflow/Editor/modules/dragging";
-import Connector from "components/Workflow/Editor/modules/connector";
-import Vue from "vue";
-
-// create body template and
-const createApp = function () {
-    $("body").append(
-        `<div id="canvas-viewport">
-            <div id="canvas-container"/>
-            <div id="overview">
-            <canvas id="overview-canvas"/>
-            <div id="overview-viewport"/>
-            </div>`
-    );
-};
-
-const nodeData = {
-    inputs: [],
-    outputs: [{ name: "out1", extensions: ["data"] }],
-    config_form: "{}",
-    tool_state: "ok",
-    tool_errors: false,
-    tooltip: "tool tooltip",
-    annotation: "tool annotation",
-    workflow_outputs: [{ output_name: "out1" }],
-    label: "Cat that data.",
-};
-
-class Node {
-    constructor(attr = {}) {
-        this.element = attr.element;
-        this.postJobActions = {};
-        this.inputTerminals = {};
-        this.outputTerminals = {};
-    }
-}
-
-function buildNode(propsData) {
-    const component = Vue.extend(WorkflowNode);
-    propsData.step = {};
-    propsData.getManager = () => {
-        return {};
-    };
-    propsData.getCanvasManager = () => {
-        return {};
-    };
-    propsData.datatypesMapper = testDatatypesMapper;
-    return new component({
-        propsData: propsData,
-        el: "#canvas-container",
-    });
-}
-
-QUnit.module("Input terminal model test", {
-    beforeEach: function () {
-        createApp();
-        this.node = new Node();
-        this.input = { extensions: ["txt"], multiple: false, optional: false };
-        const inputEl = $("<div>")[0];
-        this.input_terminal = new Terminals.InputTerminal({
-            datatypesMapper: testDatatypesMapper,
-            element: inputEl,
-            input: this.input,
-            node: this.node,
-        });
-    },
-    afterEach: function () {
-        delete this.node;
-    },
-    multiple: function () {
-        this.input.multiple = true;
-        this.input_terminal.update(this.input);
-    },
-    test_connector: function () {
-        const inputEl = $("<div>")[0];
-        const outputTerminal = new Terminals.OutputTerminal({
-            element: inputEl,
-            datatypes: ["input"],
-            input: {},
-            node: this.node,
-        });
-        const inputTerminal = this.input_terminal;
-        return new Connector({}, outputTerminal, inputTerminal);
-    },
-    with_test_connector: function (f) {
-        this.test_connector();
-        f();
-        this.reset_connectors();
-    },
-    reset_connectors: function () {
-        this.input_terminal.connectors = [];
-    },
-    test_accept: function (other) {
-        other = other || { node: {}, datatypes: ["txt"], optional: false };
-        if (!other.mapOver) {
-            other.mapOver = function () {
-                return Terminals.NULL_COLLECTION_TYPE_DESCRIPTION;
-            };
-        }
-        return this.input_terminal.canAccept(other).canAccept;
-    },
-});
-
-QUnit.test("test update", function (assert) {
-    assert.deepEqual(this.input_terminal.datatypes, ["txt"]);
-    assert.equal(this.input_terminal.multiple, false);
-    this.input_terminal.update({ extensions: ["bam"], multiple: true });
-    assert.deepEqual(this.input_terminal.datatypes, ["bam"]);
-    assert.equal(this.input_terminal.multiple, true);
-});
-
-QUnit.test("test connect", function (assert) {
-    const connector = { name: "connector" };
-    const changeSpy = sinon.spy();
-    this.input_terminal.on("change", changeSpy);
-    this.input_terminal.connect(connector);
-    assert.ok(this.input_terminal.connectors[0].name === "connector");
-});
-
-QUnit.test("test disconnect", function (assert) {
-    const connector = this.test_connector();
-    const changeSpy = sinon.spy();
-    this.input_terminal.on("change", changeSpy);
-    this.input_terminal.disconnect(connector);
-    assert.equal(this.input_terminal.connectors.length, 0);
-});
-
-QUnit.test("test redraw", function (assert) {
-    const connector = this.test_connector();
-    connector.redraw = sinon.spy();
-    this.input_terminal.redraw();
-    // Assert connectors were redrawn
-    assert.ok(connector.redraw.called);
-});
-
-QUnit.test("test destroy", function (assert) {
-    const connector = this.test_connector();
-    connector.destroy = sinon.spy();
-    this.input_terminal.destroy();
-    // Assert connectors were destroyed
-    assert.ok(connector.destroy.called);
-});
-
-QUnit.test("can accept exact datatype", function (assert) {
-    const other = { node: {}, datatypes: ["txt"] }; // input also txt
-    assert.ok(this.test_accept(other));
-});
-
-QUnit.test("can accept subclass datatype", function (assert) {
-    const other = { node: {}, datatypes: ["tabular"] }; // tabular subclass of input txt
-    assert.ok(this.test_accept(other));
-});
-
-QUnit.test("cannot accept incorrect datatype", function (assert) {
-    const other = { node: {}, datatypes: ["binary"] }; // binary is not txt
-    assert.ok(!this.test_accept(other));
-});
-
-QUnit.test("can accept inputs", function (assert) {
-    // Other is data input module - always accept (currently - could be
-    // more intelligent by looking at what else input is connected to.
-    const other = { node: {}, datatypes: ["input"] };
-    assert.ok(this.test_accept(other));
-});
-
-QUnit.test("can't connect non-optional", function (assert) {
-    const other = { node: {}, datatypes: ["input"], optional: true };
-    assert.ok(!this.test_accept(other));
-});
-
-QUnit.test("multiple inputs can accept optional outputs regardless", function (assert) {
-    // Galaxy multiple inputs have an optional field but it is hard to resolve that
-    // completely until runtime.
-    const other = { node: {}, datatypes: ["input"], optional: true };
-    this.multiple();
-    assert.ok(this.test_accept(other));
-});
-
-QUnit.test("input type can accept any datatype", function (assert) {
-    this.input.extensions = ["input"];
-    this.input_terminal.update(this.input);
-    const other = { node: {}, datatypes: ["binary"] };
-    assert.ok(this.test_accept(other));
-});
-
-QUnit.test("cannot accept when already connected", function (assert) {
-    // If other is subtype but already connected, cannot accept
-    this.with_test_connector(() => {
-        assert.ok(!this.test_accept());
-    });
-});
-
-QUnit.test("can accept already connected inputs if input is multiple", function (assert) {
-    this.multiple();
-    this.with_test_connector(() => {
-        assert.ok(this.test_accept());
-    });
-});
-
-QUnit.test("cannot accept already connected inputs if input is multiple but datatypes don't match", function (assert) {
-    const other = { node: {}, datatypes: ["binary"] }; // binary is not txt
-    this.multiple();
-    this.with_test_connector(() => {
-        assert.ok(!this.test_accept(other));
-    });
-});
-
-QUnit.test("can accept list collection for multiple input parameters if datatypes match", function (assert) {
-    this.multiple();
-    assert.ok(this.test_accept());
-});
-
-QUnit.test("can accept list collection for empty multiple inputs", function (assert) {
-    const other = {
-        node: {},
-        datatypes: ["tabular"],
-        mapOver: new Terminals.CollectionTypeDescription("list"),
-    };
-    this.multiple();
-    assert.ok(this.test_accept(other));
-});
-
-QUnit.test("cannot accept list collection for multiple input if collection already connected", function (assert) {
-    const other = {
-        node: {},
-        datatypes: ["tabular"],
-        mapOver: new Terminals.CollectionTypeDescription("list"),
-    };
-    this.multiple();
-    this.with_test_connector(() => {
-        assert.ok(!this.test_accept(other));
-    });
-});
-
-QUnit.module("Connector test", {});
-
-QUnit.test("connects only if both valid handles", function (assert) {
-    const input = { connect: sinon.spy() };
-    const output = { connect: sinon.spy() };
-    new Connector({}, input, null);
-    new Connector({}, null, output);
-    // Not attempts to connect...
-    assert.ok(!input.connect.called);
-    assert.ok(!output.connect.called);
-    new Connector({}, input, output);
-    assert.ok(input.connect.called);
-    assert.ok(output.connect.called);
-});
-
-QUnit.test("default attributes", function (assert) {
-    const input = { connect: sinon.spy() };
-    const output = { connect: sinon.spy() };
-    const connector = new Connector({}, input, output);
-    assert.equal(connector.dragging, false);
-    assert.equal(connector.svg.attr("class"), "ribbon");
-});
-
-QUnit.test("destroy", function (assert) {
-    const input = { connect: sinon.spy(), disconnect: sinon.spy() };
-    const output = { connect: sinon.spy(), disconnect: sinon.spy() };
-    const connector = new Connector({}, input, output);
-    connector.destroy();
-    assert.ok(input.disconnect.called);
-    assert.ok(output.disconnect.called);
-});
-
-QUnit.test("initial redraw", function (assert) {
-    const input = {
-        connect: sinon.spy(),
-        element: $("<div>"),
-        isMappedOver: function () {
-            return false;
-        },
-    };
-    const output = {
-        connect: sinon.spy(),
-        element: $("<div>"),
-        isMappedOver: function () {
-            return false;
-        },
-    };
-    const n = $("#canvas-container").find("svg").length;
-    const connector = new Connector({}, input, output);
-    // Ensure canvas gets set
-    assert.ok(connector.canvas);
-    // Ensure it got added to canvas container
-    assert.equal(n + 1, $("#canvas-container").find("svg").length);
-});
-
-QUnit.module("Input collection terminal model test", {
-    beforeEach: function () {
-        createApp();
-        this.node = new Node();
-        this.input = { extensions: ["txt"], collection_types: ["list"] };
-        const inputEl = $("<div>")[0];
-        this.input_terminal = new Terminals.InputCollectionTerminal({
-            datatypesMapper: testDatatypesMapper,
-            element: inputEl,
-            input: this.input,
-            node: this.node,
-        });
-    },
-    afterEach: function () {
-        delete this.node;
-    },
-});
-
-QUnit.test("Collection output can connect to same collection input type", function (assert) {
-    const inputTerminal = this.input_terminal;
-    const outputTerminal = new Terminals.OutputCollectionTerminal({
-        datatypes: ["txt"],
-        collection_type: "list",
-        node: {},
-    });
-    outputTerminal.node = { postJobActions: {} };
-    assert.ok(
-        inputTerminal.canAccept(outputTerminal).canAccept,
-        "Input terminal " + inputTerminal + " can not accept " + outputTerminal
-    );
-});
-
-QUnit.test("Optional collection output can not connect to required collection input", function (assert) {
-    const inputTerminal = this.input_terminal;
-    const outputTerminal = new Terminals.OutputCollectionTerminal({
-        datatypes: ["txt"],
-        collection_type: "list",
-        optional: true,
-        node: {},
-    });
-    outputTerminal.node = {};
-    assert.ok(!inputTerminal.canAccept(outputTerminal).canAccept);
-});
-
-QUnit.test("Collection output cannot connect to different collection input type", function (assert) {
-    const inputTerminal = this.input_terminal;
-    const outputTerminal = new Terminals.OutputCollectionTerminal({
-        datatypes: ["txt"],
-        collection_type: "paired",
-        node: {},
-    });
-    outputTerminal.node = {};
-    assert.ok(!inputTerminal.canAccept(outputTerminal).canAccept);
-});
-
-QUnit.module("Node unit test", {
-    beforeEach: function () {
-        this.input_terminal = { destroy: sinon.spy(), redraw: sinon.spy() };
-        this.output_terminal = { destroy: sinon.spy(), redraw: sinon.spy() };
-        this.node = buildNode({ type: "tool", name: "newnode" });
-        this.element = this.node.element;
-        this.node.inputTerminals.i1 = this.input_terminal;
-        this.node.outputTerminals.o1 = this.output_terminal;
-    },
-    $: function (selector) {
-        return $(this.node.element).find(selector);
-    },
-    init_field_data_simple: function () {
-        const data = {
-            inputs: [{ name: "input1", extensions: ["data"] }],
-            outputs: [{ name: "output1", extensions: ["data"] }],
-            name: "newnode",
-            label: null,
-        };
-        this.node.initData(data);
-    },
-    update_field_data_with_new_input: function () {
-        const data = {
-            inputs: [
-                { name: "input1", extensions: ["data"] },
-                { name: "extra_0|input1", extensions: ["data"] },
-            ],
-            outputs: [{ name: "output1", extensions: ["data"] }],
-            postJobActions: {},
-            label: "New Label",
-        };
-        this.node.setNode(data);
-    },
-});
-
-QUnit.test("make active", function (assert) {
-    assert.ok(this.element.className.indexOf("node-active") == -1);
-    this.node.makeActive();
-    assert.ok(this.element.className.indexOf("node-active") != -1);
-});
-
-QUnit.test("destroy", function (assert) {
-    this.node.onRemove();
-    assert.ok(this.input_terminal.destroy.called);
-    assert.ok(this.output_terminal.destroy.called);
-});
-
-QUnit.test("error", function (assert) {
-    // Test body of div updated and workflow notified of change.
-    const node_changed_spy = sinon.spy(this.node, "setData");
-    this.node.initData({ errors: "NODE ERROR", inputs: [], outputs: [] });
-    Vue.nextTick(() => {
-        const errorText = $(this.node.element).find(".node-error").text().trim();
-        assert.equal(errorText, "NODE ERROR");
-        assert.ok(node_changed_spy.called);
-    });
-});
-
-QUnit.test("init_field_data properties", function (assert) {
-    const node = this.node;
-    const node_changed_spy = sinon.spy(this.node, "setData");
-    this.node.initData(nodeData);
-    Vue.nextTick(() => {
-        assert.equal(node.config_form, "{}");
-        assert.equal(node.tool_state, "ok");
-        assert.equal(node.tooltip, "tool tooltip");
-        assert.equal(node.annotation, "tool annotation");
-        assert.equal(node.label, "Cat that data.");
-        assert.deepEqual(node.postJobActions, {});
-        assert.ok(node.activeOutputs.get("out1"));
-        assert.ok(node_changed_spy.called);
-    });
-});
-
-QUnit.test("init_field_data data", function (assert) {
-    // pre-init not tool form body...
-    assert.equal(this.$(".output-terminal").length, 0);
-    assert.equal(this.$(".input-terminal").length, 0);
-    assert.equal(this.$(".rule").length, 0);
-    const node_changed_spy = sinon.spy(this.node, "setData");
-    this.init_field_data_simple();
-    Vue.nextTick(() => {
-        assert.ok(node_changed_spy.called);
-        assert.equal(this.$(".output-terminal").length, 1);
-        assert.equal(this.$(".input-terminal").length, 1);
-        assert.equal(this.$(".rule").length, 1);
-        assert.equal(this.$(".node-title").text(), "newnode");
-        assert.ok(this.$(".node-header").find("i").hasClass("fa-wrench"));
-    });
-});
-
-QUnit.test("node title behavior", function (assert) {
-    assert.equal(this.$(".node-title").text(), "newnode");
-    const node_changed_spy = sinon.spy(this.node, "setData");
-    this.init_field_data_simple();
-    this.update_field_data_with_new_input();
-    Vue.nextTick(() => {
-        assert.equal(this.$(".node-title").text(), "New Label");
-        assert.ok(node_changed_spy.called);
-    });
-});
-
-QUnit.test("update_field_data updated data inputs and outputs", function (assert) {
-    const node_changed_spy = sinon.spy(this.node, "setData");
-    // Call init with one input and output.
-    this.init_field_data_simple();
-    this.update_field_data_with_new_input();
-    Vue.nextTick(() => {
-        // Now there are 2 inputs...
-        assert.equal(this.$(".input-terminal").length, 2);
-        assert.equal(this.$(".output-terminal").length, 1);
-        assert.equal(this.$(".rule").length, 1);
-        assert.ok(node_changed_spy.called);
-    });
-});
-
-QUnit.test("update_field_data preserves connectors", function (assert) {
-    const node_changed_spy = sinon.spy(this.node, "onChange");
-    // Call init with one input and output.
-    this.init_field_data_simple();
-
-    Vue.nextTick(() => {
-        const node = this.node;
-        const connector = new Connector({});
-        const old_input_terminal = node.inputTerminals.input1;
-        old_input_terminal.connectors.push(connector);
-
-        // Update node, make sure connector still the same...
-        this.update_field_data_with_new_input();
-        Vue.nextTick(() => {
-            assert.ok(node_changed_spy.called);
-
-            let new_input_terminal = node.inputTerminals.input1;
-            assert.equal(connector, new_input_terminal.connectors[0]);
-
-            // Update a second time, make sure connector still the same...
-            this.update_field_data_with_new_input();
-            Vue.nextTick(() => {
-                new_input_terminal = node.inputTerminals.input1;
-                assert.equal(connector, new_input_terminal.connectors[0]);
-            });
-        });
-    });
-});
-
-QUnit.test("update_field_data destroys old terminals", function (assert) {
-    const node = this.node;
-    const data = {
-        inputs: [
-            { name: "input1", extensions: ["data"] },
-            { name: "willDisappear", extensions: ["data"] },
-        ],
-        outputs: [{ name: "output1", extensions: ["data"] }],
-    };
-    node.initData(data);
-    Vue.nextTick(() => {
-        const old_input_terminal = node.inputTerminals.willDisappear;
-        const destroy_spy = sinon.spy(old_input_terminal, "destroy");
-        this.update_field_data_with_new_input();
-        Vue.nextTick(() => {
-            assert.ok(destroy_spy.called);
-        });
-    });
-});
-
-QUnit.module("Node view", {
-    beforeEach: function () {
-        this.node = buildNode({ type: "tool", name: "newnode" });
-        this.node.initData(nodeData);
-    },
-    afterEach: function () {
-        delete this.node;
-    },
-    connectAttachedTerminal: function (inputType, outputType, callback) {
-        const data = {
-            inputs: [{ name: "TestName", extensions: [inputType] }],
-            outputs: [],
-        };
-        this.node.setNode(data);
-        Vue.nextTick(() => {
-            const terminal = this.node.inputTerminals["TestName"];
-            const inputEl = $("<div>")[0];
-            const outputTerminal = new Terminals.OutputTerminal({
-                name: "TestOutput",
-                datatypes: [outputType],
-                mapOver: Terminals.NULL_COLLECTION_TYPE_DESCRIPTION,
-                element: inputEl,
-                node: {},
-            });
-            outputTerminal.node = {
-                markChanged: function () {},
-                postJobActions: [],
-                inputTerminals: {},
-                outputTerminals: {},
-                hasMappedOverInputTerminals: function () {
-                    return false;
-                },
-                hasConnectedOutputTerminals: function () {
-                    return true;
-                },
-            };
-            callback(new Connector({}, outputTerminal, terminal));
-        });
-    },
-    connectAttachedMultiInputTerminal: function (inputType, outputType, callback) {
-        const data = {
-            inputs: [{ name: "TestName", extensions: [inputType], multiple: true }],
-            outputs: [],
-        };
-        this.node.setNode(data);
-        Vue.nextTick(() => {
-            const terminal = this.node.inputTerminals["TestName"];
-            const inputEl = $("<div>")[0];
-            const outputTerminal = new Terminals.OutputTerminal({
-                name: "TestOutput",
-                datatypes: ["txt"],
-                mapOver: new Terminals.CollectionTypeDescription("list"),
-                element: inputEl,
-                node: {},
-            });
-            outputTerminal.node = {
-                markChanged: function () {},
-                postJobActions: [],
-                inputTerminals: {},
-                outputTerminals: {},
-                hasMappedOverInputTerminals: function () {
-                    return false;
-                },
-                hasConnectedOutputTerminals: function () {
-                    return true;
-                },
-            };
-            callback(new Connector({}, outputTerminal, terminal));
-        });
-    },
-    connectAttachedMappedOutput: function (callback) {
-        const node = this.node;
-        Vue.nextTick(() => {
-            const terminal = node.inputTerminals["TestName"];
-            const inputEl = $("<div>")[0];
-            const outputTerminal = new Terminals.OutputTerminal({
-                name: "TestOutput",
-                datatypes: ["txt"],
-                mapOver: new Terminals.CollectionTypeDescription("list"),
-                element: inputEl,
-                node: {},
-            });
-            outputTerminal.node = {
-                markChanged: function () {},
-                postJobActions: [],
-                inputTerminals: {},
-                outputTerminals: {},
-                hasMappedOverInputTerminals: function () {
-                    return false;
-                },
-                hasConnectedOutputTerminals: function () {
-                    return true;
-                },
-            };
-            const connector = new Connector({}, outputTerminal, terminal);
-            callback(connector);
-        });
-    },
-});
-
-QUnit.test("replacing terminal on data input update preserves connections", function (assert) {
-    this.node.inputs.push({ name: "TestName", extensions: ["txt"] });
-    this.connectAttachedTerminal("txt", "txt", (connector) => {
-        const terminal = $(this.node.element).find(".input-terminal")[0].terminal;
-        assert.ok(connector.inputHandle === terminal);
-    });
-});
-
-QUnit.test("replacing terminal on data multiple input update preserves collection connections", function (assert) {
-    this.node.inputs.push({ name: "TestName", extensions: ["txt"] });
-    this.connectAttachedMultiInputTerminal("txt", "txt", (connector) => {
-        const connector_destroy_spy = sinon.spy(connector, "destroy");
-        const data = {
-            inputs: [{ name: "TestName", extensions: ["txt"], multiple: true }],
-            outputs: [],
-        };
-        this.node.setNode(data);
-        Vue.nextTick(() => {
-            assert.ok(!connector_destroy_spy.called);
-        });
-    });
-});
-
-QUnit.test("replacing mapped terminal on data collection input update preserves connections", function (assert) {
-    const node = this.node;
-    node.inputs.push({ name: "TestName", extensions: ["txt"], input_type: "dataset_collection" });
-    this.connectAttachedMappedOutput((connector) => {
-        const terminal = $(this.node.element).find(".input-terminal")[0].terminal;
-        const data = {
-            inputs: [{ name: "TestName", extensions: ["txt"], input_type: "dataset_collection" }],
-            outputs: [],
-        };
-        node.setNode(data);
-        Vue.nextTick(() => {
-            assert.ok(connector.inputHandle === terminal);
-        });
-    });
-});
-
-QUnit.test("replacing terminal on data input destroys invalid connections", function (assert) {
-    const node = this.node;
-    node.inputs.push({ name: "TestName", extensions: ["txt"] });
-    this.connectAttachedTerminal("txt", "txt", (connector) => {
-        const connector_destroy_spy = sinon.spy(connector, "destroy");
-        const data = {
-            inputs: [{ name: "TestName", extensions: ["bam"] }],
-            outputs: [],
-        };
-        node.setNode(data);
-        Vue.nextTick(() => {
-            $(node.element).find(".input-terminal")[0].terminal;
-            assert.ok(connector_destroy_spy.called);
-        });
-    });
-});
-
-QUnit.test("replacing terminal on data input with collection changes mapping view type", function (assert) {
-    const node = this.node;
-    node.inputs.push({ name: "TestName", extensions: ["txt"] });
-    this.connectAttachedTerminal("txt", "txt", (connector) => {
-        const connector_destroy_spy = sinon.spy(connector, "destroy");
-        const data = {
-            inputs: [{ name: "TestName", extensions: ["txt"], input_type: "dataset_collection" }],
-            outputs: [],
-        };
-        node.setNode(data);
-        Vue.nextTick(() => {
-            // Input type changed to dataset_collection - old connections are reset.
-            // Would be nice to preserve these connections and make them map over.
-            $(node.element).find(".input-terminal")[0].terminal;
-            assert.ok(connector_destroy_spy.called);
-        });
-    });
-});
-
-QUnit.test(
-    "replacing terminal on data collection input with simple input changes mapping view type",
-    function (assert) {
-        const node = this.node;
-        node.inputs.push({ name: "TestName", extensions: ["txt"], input_type: "parameter" });
-        this.connectAttachedMappedOutput((connector) => {
-            const connector_destroy_spy = sinon.spy(connector, "destroy");
-            const data = {
-                inputs: [{ name: "TestName", extensions: ["txt"], input_type: "dataset" }],
-                outputs: [],
-            };
-            node.setNode(data);
-            Vue.nextTick(() => {
-                $(node.element).find(".input-terminal")[0].terminal;
-                assert.ok(connector_destroy_spy.called);
-            });
-        });
-    }
-);
-
-// global InputTerminalView
-QUnit.module("Input terminal view", {
-    beforeEach: function () {
-        this.node = buildNode({ type: "tool", name: "newnode" });
-        this.input = { name: "i1", extensions: ["txt"], multiple: false };
-        this.node.initData({ inputs: [this.input], outputs: [] });
-    },
-});
-
-QUnit.test("terminal added to node", function (assert) {
-    assert.ok(this.node.inputTerminals.i1);
-    assert.equal(this.node.inputTerminals.i1.datatypes[0], "txt");
-    assert.equal(this.node.inputTerminals.i1.multiple, false);
-});
-
-QUnit.test("terminal element", function (assert) {
-    const dragging = new InputDragging(
-        {},
-        {
-            el: document.createElement("div"),
-            terminal: {},
-        }
-    );
-    assert.equal(dragging.el.tagName, "DIV");
-});
-
-QUnit.module("Output terminal view", {
-    beforeEach: function () {
-        this.node = buildNode({ type: "tool", name: "newnode" });
-        this.output = { name: "o1", extensions: ["txt"] };
-        this.node.initData({ inputs: [], outputs: [this.output] });
-    },
-});
-
-QUnit.test("terminal added to node", function (assert) {
-    assert.ok(this.node.outputTerminals.o1);
-    assert.equal(this.node.outputTerminals.o1.datatypes[0], "txt");
-});
-
-QUnit.test("terminal element", function (assert) {
-    const dragging = new OutputDragging(
-        {},
-        {
-            el: document.createElement("div"),
-            terminal: {},
-        }
-    );
-    assert.equal(dragging.el.tagName, "DIV");
-});
-
-QUnit.module("CollectionTypeDescription", {
-    listType: function () {
-        return new Terminals.CollectionTypeDescription("list");
-    },
-    pairedType: function () {
-        return new Terminals.CollectionTypeDescription("paired");
-    },
-    pairedListType: function () {
-        return new Terminals.CollectionTypeDescription("list:paired");
-    },
-});
-
-QUnit.test("canMatch", function (assert) {
-    assert.ok(this.listType().canMatch(this.listType()));
-    assert.ok(!this.listType().canMatch(this.pairedType()));
-    assert.ok(!this.listType().canMatch(this.pairedListType()));
-});
-
-QUnit.test("canMatch special types", function (assert) {
-    assert.ok(this.listType().canMatch(Terminals.ANY_COLLECTION_TYPE_DESCRIPTION));
-    assert.ok(Terminals.ANY_COLLECTION_TYPE_DESCRIPTION.canMatch(this.pairedListType()));
-
-    assert.ok(!this.listType().canMatch(Terminals.NULL_COLLECTION_TYPE_DESCRIPTION));
-    assert.ok(!Terminals.NULL_COLLECTION_TYPE_DESCRIPTION.canMatch(this.pairedListType()));
-});
-
-QUnit.test("canMapOver", function (assert) {
-    assert.ok(!this.listType().canMapOver(this.listType()));
-    assert.ok(!this.listType().canMapOver(this.pairedType()));
-    assert.ok(this.pairedListType().canMapOver(this.pairedType()));
-    assert.ok(!this.listType().canMapOver(this.pairedListType()));
-});
-
-QUnit.test("canMapOver special types", function (assert) {
-    assert.ok(!this.listType().canMapOver(Terminals.NULL_COLLECTION_TYPE_DESCRIPTION));
-    assert.ok(!Terminals.NULL_COLLECTION_TYPE_DESCRIPTION.canMapOver(this.pairedListType()));
-
-    // Following two should be able to be relaxed someday maybe - but the
-    // tracking gets tricky I think. For now mapping only works for explicitly
-    // defined collection types.
-    assert.ok(!this.listType().canMapOver(Terminals.ANY_COLLECTION_TYPE_DESCRIPTION));
-    assert.ok(!Terminals.ANY_COLLECTION_TYPE_DESCRIPTION.canMapOver(this.pairedListType()));
-});
-
-QUnit.test("append", function (assert) {
-    const appendedType = this.listType().append(this.pairedType());
-    assert.equal(appendedType.collectionType, "list:paired");
-});
-
-QUnit.test("isCollection", function (assert) {
-    assert.ok(this.listType().isCollection);
-    assert.ok(Terminals.ANY_COLLECTION_TYPE_DESCRIPTION.isCollection);
-    assert.ok(!Terminals.NULL_COLLECTION_TYPE_DESCRIPTION.isCollection);
-});
-
-QUnit.test("equal", function (assert) {
-    assert.ok(!this.listType().equal(this.pairedType()));
-    assert.ok(this.listType().equal(this.listType()));
-
-    assert.ok(Terminals.ANY_COLLECTION_TYPE_DESCRIPTION.equal(Terminals.ANY_COLLECTION_TYPE_DESCRIPTION));
-    assert.ok(!Terminals.ANY_COLLECTION_TYPE_DESCRIPTION.equal(Terminals.NULL_COLLECTION_TYPE_DESCRIPTION));
-    assert.ok(!Terminals.ANY_COLLECTION_TYPE_DESCRIPTION.equal(this.pairedType()));
-    assert.ok(!this.pairedType().equal(Terminals.ANY_COLLECTION_TYPE_DESCRIPTION));
-
-    assert.ok(Terminals.NULL_COLLECTION_TYPE_DESCRIPTION.equal(Terminals.NULL_COLLECTION_TYPE_DESCRIPTION));
-    assert.ok(!Terminals.NULL_COLLECTION_TYPE_DESCRIPTION.equal(Terminals.ANY_COLLECTION_TYPE_DESCRIPTION));
-    assert.ok(!Terminals.NULL_COLLECTION_TYPE_DESCRIPTION.equal(this.listType()));
-    assert.ok(!this.listType().equal(Terminals.NULL_COLLECTION_TYPE_DESCRIPTION));
-});
-
-QUnit.test("default constructor", function (assert) {
-    const terminal = new Terminals.InputTerminal({
-        input: {},
-        node: {},
-    });
-    assert.ok(terminal.mapOver === Terminals.NULL_COLLECTION_TYPE_DESCRIPTION);
-});
-
-QUnit.test("constructing with mapOver", function (assert) {
-    const terminal = new Terminals.InputTerminal({
-        input: {},
-        mapOver: new Terminals.CollectionTypeDescription("list"),
-    });
-    assert.ok(terminal.mapOver.collectionType == "list");
-});
-
-QUnit.test("resetMapping", function (assert) {
-    const terminal = new Terminals.InputTerminal({
-        mapOver: new Terminals.CollectionTypeDescription("list"),
-        input: {},
-    });
-    terminal.node = {
-        hasMappedOverInputTerminals: () => true,
-        inputTerminals: {},
-        outputTerminals: {},
-    };
-    const changeSpy = sinon.spy();
-    terminal.on("change", changeSpy);
-    terminal.resetMapping();
-    assert.ok(terminal.mapOver === Terminals.NULL_COLLECTION_TYPE_DESCRIPTION);
-    assert.ok(changeSpy.called);
-});
-
-QUnit.module("terminal mapping logic", {
-    newInputTerminal: function (mapOver, input) {
-        input = input || {};
-        const node = this.newNode();
-        if (!("extensions" in input)) {
-            input["extensions"] = ["data"];
-        }
-        const inputEl = $("<div>")[0];
-        const inputTerminal = new Terminals.InputTerminal({
-            datatypesMapper: testDatatypesMapper,
-            element: inputEl,
-            input: input,
-        });
-        inputTerminal.node = node;
-        if (mapOver) {
-            inputTerminal.setMapOver(new Terminals.CollectionTypeDescription(mapOver));
-        }
-        return inputTerminal;
-    },
-    newInputParameterTerminal: function () {
-        const node = this.newNode();
-        const inputEl = $("<div>")[0];
-        const inputTerminal = new Terminals.InputParameterTerminal({
-            element: inputEl,
-            input: {},
-        });
-        inputTerminal.node = node;
-        return inputTerminal;
-    },
-    newInputCollectionTerminal: function (input) {
-        input = input || {};
-        const node = this.newNode();
-        if (!("extensions" in input)) {
-            input["extensions"] = ["data"];
-        }
-        const inputEl = $("<div>")[0];
-        const inputTerminal = new Terminals.InputCollectionTerminal({
-            datatypesMapper: testDatatypesMapper,
-            element: inputEl,
-            input: input,
-            node: node,
-        });
-        return inputTerminal;
-    },
-    newOutputTerminal: function (mapOver) {
-        const node = this.newNode();
-        const outputEl = $("<div>")[0];
-        const outputTerminal = new Terminals.OutputTerminal({
-            element: outputEl,
-            datatypes: ["data"],
-            node: {},
-        });
-        outputTerminal.node = node;
-        if (mapOver) {
-            outputTerminal.setMapOver(new Terminals.CollectionTypeDescription(mapOver));
-        }
-        return outputTerminal;
-    },
-    newOutputCollectionTerminal: function (collectionType) {
-        collectionType = collectionType || "list";
-        const node = this.newNode();
-        const outputEl = $("<div>")[0];
-        const outputTerminal = new Terminals.OutputCollectionTerminal({
-            element: outputEl,
-            datatypes: ["data"],
-            collection_type: collectionType,
-            node: {},
-        });
-        outputTerminal.node = node;
-        return outputTerminal;
-    },
-    newNode: function () {
-        const nodeEl = $("<div>")[0];
-        return new Node({ element: nodeEl });
-    },
-    _addExistingOutput: function (terminal, output, connected) {
-        const self = this;
-        const node = terminal.node;
-        if (connected) {
-            const inputTerminal = self.newInputTerminal();
-            new Connector({}, inputTerminal, output);
-        }
-        this._addTerminalTo(output, node.outputTerminals);
-        return output;
-    },
-    addOutput: function (terminal, connected) {
-        const connectedOutput = this.newOutputTerminal();
-        return this._addExistingOutput(terminal, connectedOutput, connected);
-    },
-    addCollectionOutput: function (terminal, connected) {
-        const collectionOutput = this.newOutputCollectionTerminal();
-        return this._addExistingOutput(terminal, collectionOutput, connected);
-    },
-    addConnectedOutput: function (terminal) {
-        return this.addOutput(terminal, true);
-    },
-    addConnectedCollectionOutput: function (terminal) {
-        const connectedOutput = this.newOutputCollectionTerminal();
-        return this._addExistingOutput(terminal, connectedOutput, true);
-    },
-    addConnectedInput: function (terminal) {
-        const self = this;
-        const connectedInput = this.newInputTerminal();
-        const node = terminal.node;
-        const outputTerminal = self.newOutputTerminal();
-        new Connector({}, connectedInput, outputTerminal);
-        this._addTerminalTo(connectedInput, node.inputTerminals);
-        return connectedInput;
-    },
-    _addTerminalTo: function (terminal, terminals) {
-        let name = "other";
-        while (name in terminals) {
-            name += "_";
-        }
-        terminals[name] = terminal;
-    },
-    verifyNotAttachable: function (assert, inputTerminal, output) {
-        let outputTerminal;
-        if (typeof output == "string") {
-            // Just given a collection type... create terminal out of it.
-            outputTerminal = this.newOutputTerminal(output);
-        } else {
-            outputTerminal = output;
-        }
-
-        assert.ok(!inputTerminal.attachable(outputTerminal).canAccept);
-    },
-    verifyAttachable: function (assert, inputTerminal, output) {
-        let outputTerminal;
-        if (typeof output == "string") {
-            // Just given a collection type... create terminal out of it.
-            outputTerminal = this.newOutputTerminal(output);
-        } else {
-            outputTerminal = output;
-        }
-
-        assert.ok(
-            inputTerminal.attachable(outputTerminal).canAccept,
-            "Cannot attach " + outputTerminal + " to " + inputTerminal
-        );
-
-        // Go further... make sure datatypes are being enforced
-        inputTerminal.datatypes = ["bam"];
-        outputTerminal.datatypes = ["txt"];
-        assert.ok(!inputTerminal.attachable(outputTerminal).canAccept);
-    },
-    verifyMappedOver: function (assert, terminal) {
-        assert.ok(terminal.mapOver.isCollection);
-    },
-    verifyNotMappedOver: function (assert, terminal) {
-        assert.ok(!terminal.mapOver.isCollection);
-    },
-    verifyDefaultMapOver: function (assert, terminal) {
-        const outputCollectionTerminal = this.newOutputCollectionTerminal("list");
-        assert.ok(!terminal.node.mapOver);
-        const connector = new Connector({}, outputCollectionTerminal, terminal);
-        outputCollectionTerminal.connect(connector);
-        assert.ok(terminal.node.mapOver);
-        terminal.disconnect(connector);
-        assert.ok(!terminal.node.mapOver);
-    },
-});
-
-QUnit.test("unconstrained input can be mapped over", function (assert) {
-    this.inputTerminal1 = this.newInputTerminal();
-    this.verifyAttachable(assert, this.inputTerminal1, "list");
-});
-
-QUnit.test("unmapped input can be mapped over if matching connected input terminals map type", function (assert) {
-    this.inputTerminal1 = this.newInputTerminal();
-    this.addConnectedInput(this.inputTerminal1);
-    const connectedInput2 = this.addConnectedInput(this.inputTerminal1);
-    connectedInput2.setMapOver(new Terminals.CollectionTypeDescription("list"));
-    this.verifyAttachable(assert, this.inputTerminal1, "list");
-});
-
-QUnit.test(
-    "unmapped input cannot be mapped over if not matching connected input terminals map type",
-    function (assert) {
-        this.inputTerminal1 = this.newInputTerminal();
-        const connectedInput = this.addConnectedInput(this.inputTerminal1);
-        connectedInput.setMapOver(new Terminals.CollectionTypeDescription("paired"));
-        this.verifyNotAttachable(assert, this.inputTerminal1, "list");
-    }
-);
-
-QUnit.test(
-    "unmapped input can be attached to by output collection if matching connected input terminals map type",
-    function (assert) {
-        this.inputTerminal1 = this.newInputTerminal();
-        this.addConnectedInput(this.inputTerminal1);
-        const connectedInput2 = this.addConnectedInput(this.inputTerminal1);
-        connectedInput2.setMapOver(new Terminals.CollectionTypeDescription("list"));
-        const outputTerminal = this.newOutputCollectionTerminal("list");
-        this.verifyAttachable(assert, this.inputTerminal1, outputTerminal);
-    }
-);
-
-QUnit.test(
-    "unmapped input cannot be attached to by output collection if matching connected input terminals don't match map type",
-    function (assert) {
-        this.inputTerminal1 = this.newInputTerminal();
-        this.addConnectedInput(this.inputTerminal1);
-        const connectedInput2 = this.addConnectedInput(this.inputTerminal1);
-        connectedInput2.setMapOver(new Terminals.CollectionTypeDescription("list"));
-        const outputTerminal = this.newOutputCollectionTerminal("paired");
-        this.verifyNotAttachable(assert, this.inputTerminal1, outputTerminal);
-    }
-);
-
-QUnit.test(
-    "unmapped input can be attached to by output collection if effective output type (output+mapover) is same as mapped over input",
-    function (assert) {
-        this.inputTerminal1 = this.newInputTerminal();
-        this.addConnectedInput(this.inputTerminal1);
-        const connectedInput2 = this.addConnectedInput(this.inputTerminal1);
-        connectedInput2.setMapOver(new Terminals.CollectionTypeDescription("list:paired"));
-        const outputTerminal = this.newOutputCollectionTerminal("paired");
-        outputTerminal.setMapOver(new Terminals.CollectionTypeDescription("list"));
-        this.verifyAttachable(assert, this.inputTerminal1, outputTerminal);
-    }
-);
-
-QUnit.test(
-    "unmapped input cannot be attached to by output collection if effective output type (output+mapover) is not same as mapped over input (1)",
-    function (assert) {
-        this.inputTerminal1 = this.newInputTerminal();
-        this.addConnectedInput(this.inputTerminal1);
-        const connectedInput2 = this.addConnectedInput(this.inputTerminal1);
-        connectedInput2.setMapOver(new Terminals.CollectionTypeDescription("list:paired"));
-        const outputTerminal = this.newOutputCollectionTerminal("list");
-        outputTerminal.setMapOver(new Terminals.CollectionTypeDescription("list"));
-        this.verifyNotAttachable(assert, this.inputTerminal1, outputTerminal);
-    }
-);
-
-QUnit.test(
-    "unmapped input cannot be attached to by output collection if effective output type (output+mapover) is not same as mapped over input (2)",
-    function (assert) {
-        this.inputTerminal1 = this.newInputTerminal();
-        this.addConnectedInput(this.inputTerminal1);
-        const connectedInput2 = this.addConnectedInput(this.inputTerminal1);
-        connectedInput2.setMapOver(new Terminals.CollectionTypeDescription("list:paired"));
-        const outputTerminal = this.newOutputCollectionTerminal("list");
-        outputTerminal.setMapOver(new Terminals.CollectionTypeDescription("paired"));
-        this.verifyNotAttachable(assert, this.inputTerminal1, outputTerminal);
-    }
-);
-
-QUnit.test("unmapped input with unmapped, connected outputs cannot be mapped over", function (assert) {
-    // It would invalidate the connections - someday maybe we could try to
-    // recursively map over everything down the DAG - it would be expensive
-    // to check that though.
-    this.inputTerminal1 = this.newInputTerminal();
-    this.addConnectedOutput(this.inputTerminal1);
-    this.verifyNotAttachable(assert, this.inputTerminal1, "list");
-});
-
-QUnit.test("unmapped input with connected mapped outputs can be mapped over if matching", function (assert) {
-    // It would invalidate the connections - someday maybe we could try to
-    // recursively map over everything down the DAG - it would be expensive
-    // to check that though.
-    this.inputTerminal1 = this.newInputTerminal();
-    const connectedOutput = this.addConnectedOutput(this.inputTerminal1);
-    connectedOutput.setMapOver(new Terminals.CollectionTypeDescription("list"));
-    this.verifyAttachable(assert, this.inputTerminal1, "list");
-});
-
-QUnit.test(
-    "unmapped input with connected mapped outputs cannot be mapped over if mapover not matching",
-    function (assert) {
-        // It would invalidate the connections - someday maybe we could try to
-        // recursively map over everything down the DAG - it would be expensive
-        // to check that though.
-        this.inputTerminal1 = this.newInputTerminal();
-        const connectedOutput = this.addConnectedOutput(this.inputTerminal1);
-        connectedOutput.setMapOver(new Terminals.CollectionTypeDescription("paired"));
-        this.verifyNotAttachable(assert, this.inputTerminal1, "list");
-    }
-);
-
-QUnit.test("explicitly constrained input can not be mapped over by incompatible collection type", function (assert) {
-    this.inputTerminal1 = this.newInputTerminal();
-    this.inputTerminal1.setMapOver(new Terminals.CollectionTypeDescription("paired"));
-    this.verifyNotAttachable(assert, this.inputTerminal1, "list");
-});
-
-QUnit.test("explicitly constrained input can be mapped over by compatible collection type", function (assert) {
-    this.inputTerminal1 = this.newInputTerminal();
-    this.inputTerminal1.setMapOver(new Terminals.CollectionTypeDescription("list"));
-    this.verifyAttachable(assert, this.inputTerminal1, "list");
-});
-
-QUnit.test("unconstrained collection input can be mapped over", function (assert) {
-    this.inputTerminal1 = this.newInputCollectionTerminal({ collection_types: ["paired"] });
-    this.verifyAttachable(assert, this.inputTerminal1, "list:paired");
-});
-
-QUnit.test("unconstrained collection input cannot be mapped over by incompatible type", function (assert) {
-    this.inputTerminal1 = this.newInputCollectionTerminal({ collection_types: ["list"] }); // Would need to be paired...
-    this.verifyNotAttachable(assert, this.inputTerminal1, "list:paired");
-});
-
-QUnit.test("explicitly mapped over collection input can be attached by explicit mapping", function (assert) {
-    this.inputTerminal1 = this.newInputCollectionTerminal({ collection_types: ["paired"] });
-    this.inputTerminal1.setMapOver(new Terminals.CollectionTypeDescription("list"));
-    this.verifyAttachable(assert, this.inputTerminal1, "list:paired");
-});
-
-QUnit.test("explicitly mapped over collection input can be attached by explicit mapping", function (assert) {
-    this.inputTerminal1 = this.newInputCollectionTerminal({ collection_types: ["list:paired"] });
-    this.inputTerminal1.setMapOver(new Terminals.CollectionTypeDescription("list"));
-    // effectively input is list:list:paired so shouldn't be able to attach
-    this.verifyNotAttachable(assert, this.inputTerminal1, "list:paired");
-});
-
-QUnit.test("unconnected multiple inputs can be connected to rank 1 collections", function (assert) {
-    this.inputTerminal1 = this.newInputTerminal(null, { multiple: true });
-    this.verifyAttachable(assert, this.inputTerminal1, "list");
-});
-
-QUnit.test("multiple input attachable by collections", function (assert) {
-    this.inputTerminal1 = this.newInputTerminal(null, { multiple: true });
-    const connectedInput1 = this.addConnectedInput(this.inputTerminal1);
-    this.addConnectedOutput(connectedInput1);
-    this.verifyAttachable(assert, this.inputTerminal1, "list");
-});
-
-QUnit.test("multiple input attachable by nested collections", function (assert) {
-    this.inputTerminal1 = this.newInputTerminal(null, { multiple: true });
-    const connectedInput1 = this.addConnectedInput(this.inputTerminal1);
-    this.addConnectedOutput(connectedInput1);
-    this.verifyAttachable(assert, this.inputTerminal1, "list:list");
-});
-
-QUnit.test("Multiple inputs cannot be connected to pairs", function (assert) {
-    this.inputTerminal1 = this.newInputTerminal(null, { multiple: true });
-    this.verifyNotAttachable(assert, this.inputTerminal1, "list:paired");
-});
-
-QUnit.test("resetMappingIfNeeded does nothing if not mapped", function (assert) {
-    this.inputTerminal1 = this.newInputTerminal();
-    this.inputTerminal1.resetMappingIfNeeded();
-    this.verifyNotMappedOver(assert, this.inputTerminal1);
-});
-
-QUnit.test("resetMappingIfNeeded resets unconstrained input", function (assert) {
-    this.inputTerminal1 = this.newInputTerminal("list");
-    this.verifyMappedOver(assert, this.inputTerminal1);
-    this.inputTerminal1.resetMappingIfNeeded();
-    this.verifyNotMappedOver(assert, this.inputTerminal1);
-});
-
-QUnit.test("resetMappingIfNeeded does not reset if connected output depends on being mapped", function (assert) {
-    this.inputTerminal1 = this.newInputTerminal("list");
-    const connectedOutput = this.addConnectedOutput(this.inputTerminal1);
-    connectedOutput.setMapOver(new Terminals.CollectionTypeDescription("list"));
-    this.inputTerminal1.resetMappingIfNeeded();
-    this.verifyMappedOver(assert, this.inputTerminal1);
-});
-
-QUnit.test("resetMappingIfNeeded resets if node outputs are not connected to anything", function (assert) {
-    this.inputTerminal1 = this.newInputTerminal("list");
-    const output = this.addOutput(this.inputTerminal1);
-    output.setMapOver(new Terminals.CollectionTypeDescription("list"));
-    this.inputTerminal1.resetMappingIfNeeded();
-    this.verifyNotMappedOver(assert, this.inputTerminal1);
-});
-
-QUnit.test("resetMappingIfNeeded an input resets node outputs if they not connected to anything", function (assert) {
-    this.inputTerminal1 = this.newInputTerminal("list");
-    const output = this.addOutput(this.inputTerminal1);
-    output.setMapOver(new Terminals.CollectionTypeDescription("list"));
-    this.inputTerminal1.resetMappingIfNeeded();
-    this.verifyNotMappedOver(assert, output);
-});
-
-QUnit.test(
-    "resetMappingIfNeeded an input resets node collection outputs if they not connected to anything",
-    function (assert) {
-        this.inputTerminal1 = this.newInputTerminal("list");
-        const output = this.addCollectionOutput(this.inputTerminal1);
-        output.setMapOver(new Terminals.CollectionTypeDescription("list"));
-        this.inputTerminal1.resetMappingIfNeeded();
-        this.verifyNotMappedOver(assert, output);
-    }
-);
-
-QUnit.test("resetMappingIfNeeded resets if not last mapped over input", function (assert) {
-    // Idea here is that other nodes are forcing output to still be mapped
-    // over so don't need to disconnect output nodes.
-    this.inputTerminal1 = this.newInputTerminal("list");
-    const connectedInput1 = this.addConnectedInput(this.inputTerminal1);
-    connectedInput1.setMapOver(new Terminals.CollectionTypeDescription("list"));
-    const connectedOutput = this.addConnectedOutput(this.inputTerminal1);
-    connectedOutput.setMapOver(new Terminals.CollectionTypeDescription("list"));
-    this.inputTerminal1.resetMappingIfNeeded();
-    // inputTerminal1 can be reset because connectedInput1
-    // is still forcing connectedOutput to be mapped over,
-    // so verify inputTerminal1 is rest and connectedInput1
-    // and connectedOutput are untouched.
-    this.verifyNotMappedOver(assert, this.inputTerminal1);
-    this.verifyMappedOver(assert, connectedInput1);
-    this.verifyMappedOver(assert, connectedOutput);
-});
-
-QUnit.test("simple mapping over collection outputs works correctly", function (assert) {
-    this.inputTerminal1 = this.newInputTerminal();
-    const connectedOutput = this.addConnectedCollectionOutput(this.inputTerminal1);
-    this.inputTerminal1.setMapOver(new Terminals.CollectionTypeDescription("list"));
-
-    // Can attach list output of collection type list that is being mapped
-    // over another list to a list:list (because this is what it is) but not
-    // to a list:list:list.
-    const testTerminal2 = this.newInputTerminal("list:list");
-    this.verifyAttachable(assert, testTerminal2, connectedOutput);
-
-    const testTerminal1 = this.newInputTerminal("list:list:list");
-    this.verifyNotAttachable(assert, testTerminal1, connectedOutput);
-});
-
-QUnit.test("node input terminal mapping state over collection outputs works correctly", function (assert) {
-    const inputTerminal = this.newInputTerminal();
-    this.verifyDefaultMapOver(assert, inputTerminal);
-});
-
-QUnit.test("node input parameter terminal mapping state over collection outputs works correctly", function (assert) {
-    const inputParameterTerminal = this.newInputParameterTerminal();
-    this.verifyDefaultMapOver(assert, inputParameterTerminal);
-});
diff --git a/client/tsconfig.json b/client/tsconfig.json
index 313a9390a1e..ba1e713961d 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -3,16 +3,20 @@
     "compilerOptions": {
         "target": "es2016",
         "module": "es6",
-        "baseUrl": "./src",
+
+        "baseUrl": ".",
+        "paths": {
+            "@/*": ["src/*"],
+            "@tests/*": ["tests/*"]
+        },
+        "outDir": "./dist/build",
 
         "allowJs": true,
         "checkJs": false,
-
-        "outDir": "./dist/build",
         "allowSyntheticDefaultImports": true
     },
     "vueCompilerOptions": {
         "target": 2.7
     },
-    "include": ["./types/*.d.ts", "./src/**/*.ts", "./src/**/*.tsx", "./src/**/*.vue", "./tests/**/*.ts"],
+    "include": ["./types/*.d.ts", "./src/**/*.ts", "./src/**/*.tsx", "./src/**/*.vue", "./tests/**/*.ts"]
 }
diff --git a/client/webpack.config.js b/client/webpack.config.js
index 95a20d94431..9a892104993 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -6,6 +6,7 @@ const MiniCssExtractPlugin = require("mini-css-extract-plugin");
 const CssMinimizerPlugin = require("css-minimizer-webpack-plugin");
 const DuplicatePackageCheckerPlugin = require("@cerner/duplicate-package-checker-webpack-plugin");
 const { DumpMetaPlugin } = require("dumpmeta-webpack-plugin");
+const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
 
 const scriptsBase = path.join(__dirname, "src");
 const testsBase = path.join(__dirname, "tests");
@@ -43,6 +44,7 @@ module.exports = (env = {}, argv = {}) => {
             filename: "[name].bundled.js",
         },
         resolve: {
+            plugins: [new TsconfigPathsPlugin({ extensions: [".ts", ".js", ".json", ".vue", ".scss"] })],
             extensions: [".ts", ".js", ".json", ".vue", ".scss"],
             modules: [scriptsBase, "node_modules", styleBase, testsBase],
             fallback: {
diff --git a/client/yarn.lock b/client/yarn.lock
index 238cb3c8dc8..f8301aad7da 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -4,12 +4,12 @@
 
 "@adobe/css-tools@^4.0.1":
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.0.1.tgz#b38b444ad3aa5fedbb15f2f746dcd934226a12dd"
+  resolved "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.1.tgz"
   integrity sha512-+u76oB43nOHrF4DDWRLWDCtci7f3QJoEBigemIdIeTi1ODqjx6Tad9NCVnPRwewWlKkVab5PlK8DCtPTyX7S8g==
 
 "@ampproject/remapping@^2.1.0":
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d"
+  resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz"
   integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
   dependencies:
     "@jridgewell/gen-mapping" "^0.1.0"
@@ -17,19 +17,24 @@
 
 "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.18.6.tgz#3b25d38c89600baa2dcc219edfa88a74eb2c427a"
+  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"
   integrity sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==
   dependencies:
     "@babel/highlight" "^7.18.6"
 
 "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.18.8":
   version "7.18.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.18.8.tgz#2483f565faca607b8535590e84e7de323f27764d"
+  resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz"
   integrity sha512-HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ==
 
-"@babel/core@^7.1.0", "@babel/core@^7.11.6", "@babel/core@^7.12.3", "@babel/core@^7.18.9", "@babel/core@^7.7.2", "@babel/core@^7.8.0":
+"@babel/compat-data@^7.20.0", "@babel/compat-data@^7.20.1":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733"
+  integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==
+
+"@babel/core@^7.11.6", "@babel/core@^7.12.3":
   version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.10.tgz#39ad504991d77f1f3da91be0b8b949a5bc466fb8"
+  resolved "https://registry.npmjs.org/@babel/core/-/core-7.18.10.tgz"
   integrity sha512-JQM6k6ENcBFKVtWvLavlvi/mPcpYZ3+R+2EySDEMSMbp7Mn4FexlbbJVrx2R7Ijhr01T8gyqrOaABWIOgxeUyw==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
@@ -48,13 +53,25 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/eslint-parser@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.18.9.tgz#255a63796819a97b7578751bb08ab9f2a375a031"
-  integrity sha512-KzSGpMBggz4fKbRbWLNyPVTuQr6cmCcBhOyXTw/fieOVaw5oYAwcAj4a7UKcDYCPxQq+CG1NCDZH9e2JTXquiQ==
+"@babel/core@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.20.5.tgz#45e2114dc6cd4ab167f81daf7820e8fa1250d113"
+  integrity sha512-UdOWmk4pNWTm/4DlPUl/Pt4Gz4rcEMb7CY0Y3eJl5Yz1vI8ZJGmHWaVE55LoxRjdpx0z259GE9U5STA9atUinQ==
   dependencies:
-    eslint-scope "^5.1.1"
-    eslint-visitor-keys "^2.1.0"
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.5"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-module-transforms" "^7.20.2"
+    "@babel/helpers" "^7.20.5"
+    "@babel/parser" "^7.20.5"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.1"
     semver "^6.3.0"
 
 "@babel/generator@^7.18.10", "@babel/generator@^7.19.0":
@@ -75,9 +92,18 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.20.5.tgz#cb25abee3178adf58d6814b68517c62bdbfdda95"
+  integrity sha512-jl7JY2Ykn9S0yj4DQP82sYvPU+T3g0HFcWTqDLqiuA9tGRNIj9VfbtXGAYTTkyNEnQk1jkMGOdYka8aG/lulCA==
+  dependencies:
+    "@babel/types" "^7.20.5"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    jsesc "^2.5.1"
+
 "@babel/generator@^7.7.2":
   version "7.18.12"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.12.tgz#fa58daa303757bd6f5e4bbca91b342040463d9f4"
+  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.18.12.tgz"
   integrity sha512-dfQ8ebCN98SvyL7IxNMCUtZQSq5R7kxgN+r8qYTGDmmSion1hX2C0zq2yo1bsCDhXixokv1SAWTZUMYbO/V5zg==
   dependencies:
     "@babel/types" "^7.18.10"
@@ -86,14 +112,14 @@
 
 "@babel/helper-annotate-as-pure@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
+  resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"
   integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
   dependencies:
     "@babel/types" "^7.18.6"
 
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz#acd4edfd7a566d1d51ea975dff38fd52906981bb"
+  resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz"
   integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==
   dependencies:
     "@babel/helper-explode-assignable-expression" "^7.18.6"
@@ -101,7 +127,7 @@
 
 "@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz#69e64f57b524cde3e5ff6cc5a9f4a387ee5563bf"
+  resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.9.tgz"
   integrity sha512-tzLCyVmqUiFlcFoAPLA/gL9TeYrF61VLNtb+hvkuVaB5SUjW7jcfrglBIX1vUIoT7CLP3bBlIMeyEsIl2eFQNg==
   dependencies:
     "@babel/compat-data" "^7.18.8"
@@ -109,9 +135,19 @@
     browserslist "^4.20.2"
     semver "^6.3.0"
 
+"@babel/helper-compilation-targets@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.20.0.tgz#6bf5374d424e1b3922822f1d9bdaa43b1a139d0a"
+  integrity sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==
+  dependencies:
+    "@babel/compat-data" "^7.20.0"
+    "@babel/helper-validator-option" "^7.18.6"
+    browserslist "^4.21.3"
+    semver "^6.3.0"
+
 "@babel/helper-create-class-features-plugin@^7.18.6":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz#d802ee16a64a9e824fcbf0a2ffc92f19d58550ce"
+  resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.9.tgz"
   integrity sha512-WvypNAYaVh23QcjpMR24CwZY2Nz6hqdOcFdPbNpV56hL5H6KiFheO7Xm1aPdlLQ7d5emYZX7VZwPp9x3z+2opw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
@@ -137,16 +173,24 @@
 
 "@babel/helper-create-regexp-features-plugin@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz#3e35f4e04acbbf25f1b3534a657610a000543d3c"
+  resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz"
   integrity sha512-7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
     regexpu-core "^5.1.0"
 
-"@babel/helper-define-polyfill-provider@^0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.2.tgz#bd10d0aca18e8ce012755395b05a79f45eca5073"
-  integrity sha512-r9QJJ+uDWrd+94BSPcP6/de67ygLtvVy6cK4luE6MOuDsZIdoaPBnfSpbO/+LTifjPckbKXRuI9BB/Z2/y3iTg==
+"@babel/helper-create-regexp-features-plugin@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.20.5.tgz#5ea79b59962a09ec2acf20a963a01ab4d076ccca"
+  integrity sha512-m68B1lkg3XDGX5yCvGO0kPx3v9WIYLnzjKfPcQiwntEQa5ZeRkPmo2X/ISJc8qxWGfwUr+kvZAeEzAwLec2r2w==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    regexpu-core "^5.2.1"
+
+"@babel/helper-define-polyfill-provider@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
+  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
   dependencies:
     "@babel/helper-compilation-targets" "^7.17.7"
     "@babel/helper-plugin-utils" "^7.16.7"
@@ -157,12 +201,12 @@
 
 "@babel/helper-environment-visitor@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
+  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz"
   integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
 
 "@babel/helper-explode-assignable-expression@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
+  resolved "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"
   integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
   dependencies:
     "@babel/types" "^7.18.6"
@@ -177,21 +221,21 @@
 
 "@babel/helper-hoist-variables@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
+  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"
   integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
   dependencies:
     "@babel/types" "^7.18.6"
 
 "@babel/helper-member-expression-to-functions@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz#1531661e8375af843ad37ac692c132841e2fd815"
+  resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.9.tgz"
   integrity sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==
   dependencies:
     "@babel/types" "^7.18.9"
 
 "@babel/helper-module-imports@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz#1e3ebdbbd08aad1437b428c50204db13c5a3ca6e"
+  resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"
   integrity sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==
   dependencies:
     "@babel/types" "^7.18.6"
@@ -212,7 +256,7 @@
 
 "@babel/helper-module-transforms@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz#5a1079c005135ed627442df31a42887e80fcb712"
+  resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.9.tgz"
   integrity sha512-KYNqY0ICwfv19b31XzvmI/mfcylOzbLtowkw+mfvGPAQ3kfCnMLYbED3YecL5tPd8nAYFQFAd6JHp2LxZk/J1g==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
@@ -224,16 +268,30 @@
     "@babel/traverse" "^7.18.9"
     "@babel/types" "^7.18.9"
 
+"@babel/helper-module-transforms@^7.19.6", "@babel/helper-module-transforms@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.20.2.tgz#ac53da669501edd37e658602a21ba14c08748712"
+  integrity sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.20.2"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.1"
+    "@babel/types" "^7.20.2"
+
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
+  resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"
   integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
   dependencies:
     "@babel/types" "^7.18.6"
 
 "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz#4b8aea3b069d8cb8a72cdfe28ddf5ceca695ef2f"
+  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.9.tgz"
   integrity sha512-aBXPT3bmtLryXaoJLyYPXPlSD4p1ld9aYeR+sJNOZjJJGiOpb+fKfh3NkcCu7J54nUJwCERPBExCCpyCOHnu/w==
 
 "@babel/helper-plugin-utils@^7.18.6":
@@ -248,7 +306,7 @@
 
 "@babel/helper-remap-async-to-generator@^7.18.6", "@babel/helper-remap-async-to-generator@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
+  resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz"
   integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
@@ -258,7 +316,7 @@
 
 "@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz#1092e002feca980fbbb0bd4d51b74a65c6a500e6"
+  resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.9.tgz"
   integrity sha512-dNsWibVI4lNT6HiuOIBr1oyxo40HvIVmbwPUm3XZ7wMh4k2WxrxTqZwSqw/eEmXDS9np0ey5M2bz9tBmO9c+YQ==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
@@ -280,28 +338,35 @@
 
 "@babel/helper-simple-access@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz#d6d8f51f4ac2978068df934b569f08f29788c7ea"
+  resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz"
   integrity sha512-iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g==
   dependencies:
     "@babel/types" "^7.18.6"
 
+"@babel/helper-simple-access@^7.19.4", "@babel/helper-simple-access@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz#0ab452687fe0c2cfb1e2b9e0015de07fc2d62dd9"
+  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
+  dependencies:
+    "@babel/types" "^7.20.2"
+
 "@babel/helper-skip-transparent-expression-wrappers@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz#778d87b3a758d90b471e7b9918f34a9a02eb5818"
+  resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.9.tgz"
   integrity sha512-imytd2gHi3cJPsybLRbmFrF7u5BIEuI2cNheyKi3/iOBC63kNn3q8Crn2xVuESli0aM4KYsyEqKyS7lFL8YVtw==
   dependencies:
     "@babel/types" "^7.18.9"
 
 "@babel/helper-split-export-declaration@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
+  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"
   integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
   dependencies:
     "@babel/types" "^7.18.6"
 
 "@babel/helper-string-parser@^7.18.10":
   version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz#181f22d28ebe1b3857fa575f5c290b1aaf659b56"
+  resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz"
   integrity sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==
 
 "@babel/helper-string-parser@^7.19.4":
@@ -311,7 +376,7 @@
 
 "@babel/helper-validator-identifier@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz#9c97e30d31b2b8c72a1d08984f2ca9b574d7a076"
+  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz"
   integrity sha512-MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g==
 
 "@babel/helper-validator-identifier@^7.19.1":
@@ -321,12 +386,12 @@
 
 "@babel/helper-validator-option@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz#bf0d2b5a509b1f336099e4ff36e1a63aa5db4db8"
+  resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"
   integrity sha512-XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw==
 
 "@babel/helper-wrap-function@^7.18.9":
   version "7.18.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz#bff23ace436e3f6aefb61f85ffae2291c80ed1fb"
+  resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.11.tgz"
   integrity sha512-oBUlbv+rjZLh2Ks9SKi4aL7eKaAXBWleHzU89mP0G6BMUlRxSckk9tSIkgDGydhgFxHuGSlBQZfnaD47oBEB7w==
   dependencies:
     "@babel/helper-function-name" "^7.18.9"
@@ -336,16 +401,25 @@
 
 "@babel/helpers@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.9.tgz#4bef3b893f253a1eced04516824ede94dcfe7ff9"
+  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.9.tgz"
   integrity sha512-Jf5a+rbrLoR4eNdUmnFu8cN5eNJT6qdTdOg5IHIzq87WwyRw9PwguLFOWYgktN/60IP4fgDUawJvs7PjQIzELQ==
   dependencies:
     "@babel/template" "^7.18.6"
     "@babel/traverse" "^7.18.9"
     "@babel/types" "^7.18.9"
 
+"@babel/helpers@^7.20.5":
+  version "7.20.6"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.20.6.tgz#e64778046b70e04779dfbdf924e7ebb45992c763"
+  integrity sha512-Pf/OjgfgFRW5bApskEz5pvidpim7tEDPlFtKcNRXWmfHGn9IEI2W2flqRQXTFb7gIPTyK++N6rVHuwKut4XK6w==
+  dependencies:
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.20.5"
+    "@babel/types" "^7.20.5"
+
 "@babel/highlight@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
+  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"
   integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
   dependencies:
     "@babel/helper-validator-identifier" "^7.18.6"
@@ -354,7 +428,7 @@
 
 "@babel/parser@^7.1.0", "@babel/parser@^7.10.3", "@babel/parser@^7.14.7", "@babel/parser@^7.18.4":
   version "7.18.11"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.11.tgz#68bb07ab3d380affa9a3f96728df07969645d2d9"
+  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.18.11.tgz"
   integrity sha512-9JKn5vN+hDt0Hdqn1PiJ2guflwP+B6Ga8qbDuoF0PzzVhrzsKIJo8yGqVk6CmMHiMei9w1C1Bp9IMJSIK+HPIQ==
 
 "@babel/parser@^7.18.10", "@babel/parser@^7.18.11", "@babel/parser@^7.19.1":
@@ -367,35 +441,40 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.3.tgz#5358cf62e380cf69efcb87a7bb922ff88bfac6e2"
   integrity sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==
 
+"@babel/parser@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.5.tgz#7f3c7335fe417665d929f34ae5dceae4c04015e8"
+  integrity sha512-r27t/cy/m9uKLXQNWWebeCUHgnAZq0CpG1OwKRxzJMP1vpSU4bSIK2hq+/cp0bQxetkXx38n09rNu8jVkcK/zA==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
+  resolved "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz"
   integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz#a11af19aa373d68d561f08e0a57242350ed0ec50"
+  resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.18.9.tgz"
   integrity sha512-AHrP9jadvH7qlOj6PINbgSuphjQUAK7AOT7DPjBo9EHoLhQTnnK5u45e1Hd4DbSQEO9nqPWtQ89r+XEOWFScKg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
     "@babel/plugin-proposal-optional-chaining" "^7.18.9"
 
-"@babel/plugin-proposal-async-generator-functions@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.10.tgz#85ea478c98b0095c3e4102bff3b67d306ed24952"
-  integrity sha512-1mFuY2TOsR1hxbjCo4QL+qlIjV07p4H4EUYw2J/WCqsvFV6V9X9z9YhXbWndc/4fw+hYGlDT7egYxliMp5O6Ew==
+"@babel/plugin-proposal-async-generator-functions@^7.20.1":
+  version "7.20.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.1.tgz#352f02baa5d69f4e7529bdac39aaa02d41146af9"
+  integrity sha512-Gh5rchzSwE4kC+o/6T8waD0WHEQIsDmjltY8WnWRXHUdH8axZhuH86Ov9M72YhJfDrZseQwuuWaaIT/TmePp3g==
   dependencies:
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/helper-remap-async-to-generator" "^7.18.9"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
 "@babel/plugin-proposal-class-properties@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"
   integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.18.6"
@@ -403,7 +482,7 @@
 
 "@babel/plugin-proposal-class-static-block@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz#8aa81d403ab72d3962fc06c26e222dacfc9b9020"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.6.tgz"
   integrity sha512-+I3oIiNxrCpup3Gi8n5IGMwj0gOCAjcJUSQEcotNnCCPMEnixawOQ+KeJPlgfjzx+FKQ1QSyZOWe7wmoJp7vhw==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.18.6"
@@ -412,7 +491,7 @@
 
 "@babel/plugin-proposal-dynamic-import@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz"
   integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
@@ -420,7 +499,7 @@
 
 "@babel/plugin-proposal-export-namespace-from@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz"
   integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
@@ -428,7 +507,7 @@
 
 "@babel/plugin-proposal-json-strings@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz"
   integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
@@ -436,7 +515,7 @@
 
 "@babel/plugin-proposal-logical-assignment-operators@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz#8148cbb350483bf6220af06fa6db3690e14b2e23"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.9.tgz"
   integrity sha512-128YbMpjCrP35IOExw2Fq+x55LMP42DzhOhX2aNNIdI9avSWl2PI0yuBWarr3RYpZBSPtabfadkH2yeRiMD61Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
@@ -444,7 +523,7 @@
 
 "@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz"
   integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
@@ -452,26 +531,26 @@
 
 "@babel/plugin-proposal-numeric-separator@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz"
   integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.9.tgz#f9434f6beb2c8cae9dfcf97d2a5941bbbf9ad4e7"
-  integrity sha512-kDDHQ5rflIeY5xl69CEqGEZ0KY369ehsCIEbTGb4siHG5BE9sga/T0r0OUwyZNLMmZE79E1kbsqAjwFCW4ds6Q==
+"@babel/plugin-proposal-object-rest-spread@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.2.tgz#a556f59d555f06961df1e572bb5eca864c84022d"
+  integrity sha512-Ks6uej9WFK+fvIMesSqbAto5dD8Dz4VuuFvGJFKgIGSkJuRGcrwGECPA1fDgQK3/DbExBJpEkTeYeB8geIFCSQ==
   dependencies:
-    "@babel/compat-data" "^7.18.8"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/compat-data" "^7.20.1"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.18.8"
+    "@babel/plugin-transform-parameters" "^7.20.1"
 
 "@babel/plugin-proposal-optional-catch-binding@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz"
   integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
@@ -479,7 +558,7 @@
 
 "@babel/plugin-proposal-optional-chaining@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz#e8e8fe0723f2563960e4bf5e9690933691915993"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.9.tgz"
   integrity sha512-v5nwt4IqBXihxGsW2QmCWMDS3B3bzGIk/EQVZz2ei7f3NJl8NzAJVvUmpDW5q1CRNY+Beb/k58UAH1Km1N411w==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
@@ -488,7 +567,7 @@
 
 "@babel/plugin-proposal-private-methods@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz"
   integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
   dependencies:
     "@babel/helper-create-class-features-plugin" "^7.18.6"
@@ -496,7 +575,7 @@
 
 "@babel/plugin-proposal-private-property-in-object@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz#a64137b232f0aca3733a67eb1a144c192389c503"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.18.6.tgz"
   integrity sha512-9Rysx7FOctvT5ouj5JODjAFAkgGoudQuLPamZb0v1TGLpapdNaftzifU8NTWQm0IRjqoYypdrSmyWgkocDQ8Dw==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
@@ -506,7 +585,7 @@
 
 "@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"
   integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
@@ -514,119 +593,126 @@
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-bigint@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz"
   integrity sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3":
   version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"
   integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-syntax-class-static-block@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"
   integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"
   integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-export-namespace-from@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"
   integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-syntax-import-assertions@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.18.6.tgz#cd6190500a4fa2fe31990a963ffab4b63e4505e4"
-  integrity sha512-/DU3RXad9+bZwrgWJQKbr39gYbJpLJHezqEzRzi/BHRlJ9zsQb4CK2CA/5apllXNomwA1qHwzvHl+AdEmC5krQ==
+"@babel/plugin-syntax-import-assertions@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
+  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
 "@babel/plugin-syntax-import-meta@^7.8.3":
   version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz"
   integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
+"@babel/plugin-syntax-jsx@^7.7.2":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.18.6.tgz#a8feef63b010150abd97f1649ec296e849943ca0"
+  integrity sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.18.6"
+
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
   version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"
   integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-numeric-separator@^7.10.4", "@babel/plugin-syntax-numeric-separator@^7.8.3":
   version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"
   integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-private-property-in-object@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"
   integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3":
   version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"
   integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
@@ -640,21 +726,21 @@
 
 "@babel/plugin-syntax-typescript@^7.7.2":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz#1c09cd25795c7c2b8a4ba9ae49394576d4133285"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.18.6.tgz"
   integrity sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-arrow-functions@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz#19063fcf8771ec7b31d742339dac62433d0611fe"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz"
   integrity sha512-9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-async-to-generator@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz#ccda3d1ab9d5ced5265fdb13f1882d5476c71615"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz"
   integrity sha512-ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag==
   dependencies:
     "@babel/helper-module-imports" "^7.18.6"
@@ -663,49 +749,50 @@
 
 "@babel/plugin-transform-block-scoped-functions@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz"
   integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoping@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.9.tgz#f9b7e018ac3f373c81452d6ada8bd5a18928926d"
-  integrity sha512-5sDIJRV1KtQVEbt/EIBwGy4T01uYIo4KRB3VUqzkhrAIOGx7AoctL9+Ux88btY0zXdDyPJ9mW+bg+v+XEkGmtw==
+"@babel/plugin-transform-block-scoping@^7.20.2":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.20.5.tgz#401215f9dc13dc5262940e2e527c9536b3d7f237"
+  integrity sha512-WvpEIW9Cbj9ApF3yJCjIEEf1EiNJLtXagOrL5LNWEZOo3jv8pmPoYTSNJQvqej8OavVlgOoOPw6/htGZro6IkA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-classes@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.9.tgz#90818efc5b9746879b869d5ce83eb2aa48bbc3da"
-  integrity sha512-EkRQxsxoytpTlKJmSPYrsOMjCILacAjtSVkd4gChEe2kXjFCun3yohhW5I7plXJhCemM0gKsaGMcO8tinvCA5g==
+"@babel/plugin-transform-classes@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.20.2.tgz#c0033cf1916ccf78202d04be4281d161f6709bb2"
+  integrity sha512-9rbPp0lCVVoagvtEyQKSo5L8oo0nQS/iif+lwlAz29MccX2642vWDlSZK+2T2buxbopotId2ld7zZAzRfz9j1g==
   dependencies:
     "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.20.0"
     "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
     "@babel/helper-optimise-call-expression" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-replace-supers" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-replace-supers" "^7.19.1"
     "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
 
 "@babel/plugin-transform-computed-properties@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz#2357a8224d402dad623caf6259b611e56aec746e"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.9.tgz"
   integrity sha512-+i0ZU1bCDymKakLxn5srGHrsAPRELC2WIbzwjLhHW9SIE1cPYkLCL0NlnXMZaM1vhfgA2+M7hySk42VBvrkBRw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-destructuring@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.9.tgz#68906549c021cb231bee1db21d3b5b095f8ee292"
-  integrity sha512-p5VCYNddPLkZTq4XymQIaIfZNJwT9YsjkPOhkVEqt6QIpQFZVM9IltqqYpOEkJoN1DPznmxUDyZ5CTZs/ZCuHA==
+"@babel/plugin-transform-destructuring@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.20.2.tgz#c23741cfa44ddd35f5e53896e88c75331b8b2792"
+  integrity sha512-mENM+ZHrvEgxLTBXUiQ621rRXZes3KWUv6NdQlrnr1TkWVw+hUjQBZuP2X32qKlrlG2BzgR95gkuCRSkJl8vIw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
 "@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz"
   integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
@@ -713,14 +800,14 @@
 
 "@babel/plugin-transform-duplicate-keys@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz"
   integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-exponentiation-operator@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz"
   integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
   dependencies:
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
@@ -728,14 +815,14 @@
 
 "@babel/plugin-transform-for-of@^7.18.8":
   version "7.18.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz#6ef8a50b244eb6a0bdbad0c7c61877e4e30097c1"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz"
   integrity sha512-yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-function-name@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz"
   integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
   dependencies:
     "@babel/helper-compilation-targets" "^7.18.9"
@@ -744,30 +831,38 @@
 
 "@babel/plugin-transform-literals@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz"
   integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-member-expression-literals@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz"
   integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-modules-amd@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz#8c91f8c5115d2202f277549848874027d7172d21"
-  integrity sha512-Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg==
+"@babel/plugin-transform-modules-amd@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.19.6.tgz#aca391801ae55d19c4d8d2ebfeaa33df5f2a2cbd"
+  integrity sha512-uG3od2mXvAtIFQIh0xrpLH6r5fpSQN04gIVovl+ODLdUMANokxQLZnPBHcjmv3GxRjnqwLuHvppjjcelqUFZvg==
   dependencies:
-    "@babel/helper-module-transforms" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.18.6", "@babel/plugin-transform-modules-commonjs@^7.2.0":
+"@babel/plugin-transform-modules-commonjs@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.19.6.tgz#25b32feef24df8038fc1ec56038917eacb0b730c"
+  integrity sha512-8PIa1ym4XRTKuSsOUXqDG0YaOlEuTVvHMe5JCfgBMOtHvJKw/4NGovEGN33viISshG/rZNVrACiBmPQLvWN8xQ==
+  dependencies:
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-simple-access" "^7.19.4"
+
+"@babel/plugin-transform-modules-commonjs@^7.2.0":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz#afd243afba166cca69892e24a8fd8c9f2ca87883"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz"
   integrity sha512-Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q==
   dependencies:
     "@babel/helper-module-transforms" "^7.18.6"
@@ -775,65 +870,64 @@
     "@babel/helper-simple-access" "^7.18.6"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.9.tgz#545df284a7ac6a05125e3e405e536c5853099a06"
-  integrity sha512-zY/VSIbbqtoRoJKo2cDTewL364jSlZGvn0LKOf9ntbfxOvjfmyrdtEEOAdswOswhZEb8UH3jDkCKHd1sPgsS0A==
+"@babel/plugin-transform-modules-systemjs@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.19.6.tgz#59e2a84064b5736a4471b1aa7b13d4431d327e0d"
+  integrity sha512-fqGLBepcc3kErfR9R3DnVpURmckXP7gj7bAlrTQyBxrigFqszZCkFkcoxzCp2v32XmwXLvbw+8Yq9/b+QqksjQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-module-transforms" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
-    "@babel/helper-validator-identifier" "^7.18.6"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.19.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    "@babel/helper-validator-identifier" "^7.19.1"
 
 "@babel/plugin-transform-modules-umd@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz"
   integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
   dependencies:
     "@babel/helper-module-transforms" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.18.6":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz#c89bfbc7cc6805d692f3a49bc5fc1b630007246d"
-  integrity sha512-UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8"
+  integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-create-regexp-features-plugin" "^7.20.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
 "@babel/plugin-transform-new-target@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz"
   integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-object-super@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz"
   integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/helper-replace-supers" "^7.18.6"
 
-"@babel/plugin-transform-parameters@^7.18.8":
-  version "7.18.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz#ee9f1a0ce6d78af58d0956a9378ea3427cccb48a"
-  integrity sha512-ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg==
+"@babel/plugin-transform-parameters@^7.20.1":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.20.5.tgz#f8f9186c681d10c3de7620c916156d893c8a019e"
+  integrity sha512-h7plkOmcndIUWXZFLgpbrh2+fXAi47zcUX7IrOQuZdLD0I0KvjJ6cvo3BEcAOsDOcZhVKGJqv07mkSqK0y2isQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
 "@babel/plugin-transform-property-literals@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz"
   integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-regenerator@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz#585c66cb84d4b4bf72519a34cfce761b8676ca73"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz"
   integrity sha512-poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
@@ -841,55 +935,55 @@
 
 "@babel/plugin-transform-reserved-words@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz"
   integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-runtime@^7.18.9":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.18.10.tgz#37d14d1fa810a368fd635d4d1476c0154144a96f"
-  integrity sha512-q5mMeYAdfEbpBAgzl7tBre/la3LeCxmDO1+wMXRdPWbcoMjR3GiXlCLk7JBZVVye0bqTGNMbt0yYVXX1B1jEWQ==
+"@babel/plugin-transform-runtime@^7.19.6":
+  version "7.19.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz#9d2a9dbf4e12644d6f46e5e75bfbf02b5d6e9194"
+  integrity sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==
   dependencies:
     "@babel/helper-module-imports" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.9"
-    babel-plugin-polyfill-corejs2 "^0.3.2"
-    babel-plugin-polyfill-corejs3 "^0.5.3"
-    babel-plugin-polyfill-regenerator "^0.4.0"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
     semver "^6.3.0"
 
 "@babel/plugin-transform-shorthand-properties@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"
   integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-spread@^7.18.9":
-  version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.9.tgz#6ea7a6297740f381c540ac56caf75b05b74fb664"
-  integrity sha512-39Q814wyoOPtIB/qGopNIL9xDChOE1pNU0ZY5dO0owhiVt/5kFm4li+/bBtwc7QotG0u5EPzqhZdjMtmqBqyQA==
+"@babel/plugin-transform-spread@^7.19.0":
+  version "7.19.0"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.19.0.tgz#dd60b4620c2fec806d60cfaae364ec2188d593b6"
+  integrity sha512-RsuMk7j6n+r752EtzyScnWkQyuJdli6LdO5Klv8Yx0OfPVTcQkIUfS8clx5e9yHXzlnhOZF3CbQ8C2uP5j074w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.19.0"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.18.9"
 
 "@babel/plugin-transform-sticky-regex@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz"
   integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-transform-template-literals@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz"
   integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-typeof-symbol@^7.18.9":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz"
   integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
@@ -905,31 +999,31 @@
 
 "@babel/plugin-transform-unicode-escapes@^7.18.10":
   version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz"
   integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
 "@babel/plugin-transform-unicode-regex@^7.18.6":
   version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz"
   integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/preset-env@^7.18.9":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.10.tgz#83b8dfe70d7eea1aae5a10635ab0a5fe60dfc0f4"
-  integrity sha512-wVxs1yjFdW3Z/XkNfXKoblxoHgbtUF7/l3PvvP4m02Qz9TZ6uZGxRVYjSQeR87oQmHco9zWitW5J82DJ7sCjvA==
+"@babel/preset-env@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.20.2.tgz#9b1642aa47bb9f43a86f9630011780dab7f86506"
+  integrity sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==
   dependencies:
-    "@babel/compat-data" "^7.18.8"
-    "@babel/helper-compilation-targets" "^7.18.9"
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/compat-data" "^7.20.1"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/helper-validator-option" "^7.18.6"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
-    "@babel/plugin-proposal-async-generator-functions" "^7.18.10"
+    "@babel/plugin-proposal-async-generator-functions" "^7.20.1"
     "@babel/plugin-proposal-class-properties" "^7.18.6"
     "@babel/plugin-proposal-class-static-block" "^7.18.6"
     "@babel/plugin-proposal-dynamic-import" "^7.18.6"
@@ -938,7 +1032,7 @@
     "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9"
     "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
     "@babel/plugin-proposal-numeric-separator" "^7.18.6"
-    "@babel/plugin-proposal-object-rest-spread" "^7.18.9"
+    "@babel/plugin-proposal-object-rest-spread" "^7.20.2"
     "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
     "@babel/plugin-proposal-optional-chaining" "^7.18.9"
     "@babel/plugin-proposal-private-methods" "^7.18.6"
@@ -949,7 +1043,7 @@
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-import-assertions" "^7.18.6"
+    "@babel/plugin-syntax-import-assertions" "^7.20.0"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -962,10 +1056,10 @@
     "@babel/plugin-transform-arrow-functions" "^7.18.6"
     "@babel/plugin-transform-async-to-generator" "^7.18.6"
     "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
-    "@babel/plugin-transform-block-scoping" "^7.18.9"
-    "@babel/plugin-transform-classes" "^7.18.9"
+    "@babel/plugin-transform-block-scoping" "^7.20.2"
+    "@babel/plugin-transform-classes" "^7.20.2"
     "@babel/plugin-transform-computed-properties" "^7.18.9"
-    "@babel/plugin-transform-destructuring" "^7.18.9"
+    "@babel/plugin-transform-destructuring" "^7.20.2"
     "@babel/plugin-transform-dotall-regex" "^7.18.6"
     "@babel/plugin-transform-duplicate-keys" "^7.18.9"
     "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
@@ -973,35 +1067,35 @@
     "@babel/plugin-transform-function-name" "^7.18.9"
     "@babel/plugin-transform-literals" "^7.18.9"
     "@babel/plugin-transform-member-expression-literals" "^7.18.6"
-    "@babel/plugin-transform-modules-amd" "^7.18.6"
-    "@babel/plugin-transform-modules-commonjs" "^7.18.6"
-    "@babel/plugin-transform-modules-systemjs" "^7.18.9"
+    "@babel/plugin-transform-modules-amd" "^7.19.6"
+    "@babel/plugin-transform-modules-commonjs" "^7.19.6"
+    "@babel/plugin-transform-modules-systemjs" "^7.19.6"
     "@babel/plugin-transform-modules-umd" "^7.18.6"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.18.6"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1"
     "@babel/plugin-transform-new-target" "^7.18.6"
     "@babel/plugin-transform-object-super" "^7.18.6"
-    "@babel/plugin-transform-parameters" "^7.18.8"
+    "@babel/plugin-transform-parameters" "^7.20.1"
     "@babel/plugin-transform-property-literals" "^7.18.6"
     "@babel/plugin-transform-regenerator" "^7.18.6"
     "@babel/plugin-transform-reserved-words" "^7.18.6"
     "@babel/plugin-transform-shorthand-properties" "^7.18.6"
-    "@babel/plugin-transform-spread" "^7.18.9"
+    "@babel/plugin-transform-spread" "^7.19.0"
     "@babel/plugin-transform-sticky-regex" "^7.18.6"
     "@babel/plugin-transform-template-literals" "^7.18.9"
     "@babel/plugin-transform-typeof-symbol" "^7.18.9"
     "@babel/plugin-transform-unicode-escapes" "^7.18.10"
     "@babel/plugin-transform-unicode-regex" "^7.18.6"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.18.10"
-    babel-plugin-polyfill-corejs2 "^0.3.2"
-    babel-plugin-polyfill-corejs3 "^0.5.3"
-    babel-plugin-polyfill-regenerator "^0.4.0"
-    core-js-compat "^3.22.1"
+    "@babel/types" "^7.20.2"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
+    core-js-compat "^3.25.1"
     semver "^6.3.0"
 
 "@babel/preset-modules@^0.1.5":
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
+  resolved "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz"
   integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -1021,14 +1115,14 @@
 
 "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
   version "7.18.9"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.18.9.tgz#b4fcfce55db3d2e5e080d2490f608a3b9f407f4a"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.9.tgz"
   integrity sha512-lkqXDcvlFT5rvEjiu6+QYO+1GXrEHRo2LOtS7E4GtX5ESIZOgepqsZBVIj6Pv+a6zqsya9VCgiK1KAK4BvJDAw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.0.0-beta.46", "@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.3.3":
+"@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.3.3":
   version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71"
+  resolved "https://registry.npmjs.org/@babel/template/-/template-7.18.10.tgz"
   integrity sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==
   dependencies:
     "@babel/code-frame" "^7.18.6"
@@ -1037,7 +1131,7 @@
 
 "@babel/traverse@^7.10.3", "@babel/traverse@^7.18.10", "@babel/traverse@^7.18.11", "@babel/traverse@^7.7.2":
   version "7.18.11"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.11.tgz#3d51f2afbd83ecf9912bcbb5c4d94e3d2ddaa16f"
+  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.11.tgz"
   integrity sha512-TG9PiM2R/cWCAy6BPJKeHzNbu4lPzOSZpeMfeNErskGpTJx6trEvFaVCbDvpcxwy49BKWmEPwiW8mrysNiDvIQ==
   dependencies:
     "@babel/code-frame" "^7.18.6"
@@ -1083,9 +1177,25 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.20.1", "@babel/traverse@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.20.5.tgz#78eb244bea8270fdda1ef9af22a5d5e5b7e57133"
+  integrity sha512-WM5ZNN3JITQIq9tFZaw1ojLU3WgWdtkxnhM1AegMS+PvHjkM5IXjmYEGY7yukz5XS4sJyEf2VzWjI8uAavhxBQ==
+  dependencies:
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.5"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.20.5"
+    "@babel/types" "^7.20.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@^7.0.0", "@babel/types@^7.10.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
   version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.10.tgz#4908e81b6b339ca7c6b7a555a5fc29446f26dde6"
+  resolved "https://registry.npmjs.org/@babel/types/-/types-7.18.10.tgz"
   integrity sha512-MJvnbEiiNkpjo+LknnmRrqbY1GPUUggjv+wQVjetM/AONoupqRALB7I6jGqNUAZsKcRIEu2J6FRFvsczljjsaQ==
   dependencies:
     "@babel/helper-string-parser" "^7.18.10"
@@ -1110,14 +1220,23 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.20.5":
+  version "7.20.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.20.5.tgz#e206ae370b5393d94dfd1d04cd687cace53efa84"
+  integrity sha512-c9fst/h2/dcF7H+MJKZ2T0KjEQ8hY/BNnDk/H3XY8C4Aw/eWQXWn/lWntHF9ooUBnGmEvbfGrTgLWc+um0YDUg==
+  dependencies:
+    "@babel/helper-string-parser" "^7.19.4"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
-  resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
+  resolved "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
 "@cerner/duplicate-package-checker-webpack-plugin@^2.3.0":
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@cerner/duplicate-package-checker-webpack-plugin/-/duplicate-package-checker-webpack-plugin-2.3.0.tgz#67de41aae7f756307f9306c5a87c35011ed0f29b"
+  resolved "https://registry.npmjs.org/@cerner/duplicate-package-checker-webpack-plugin/-/duplicate-package-checker-webpack-plugin-2.3.0.tgz"
   integrity sha512-2FdUL/10qOjXzPTt/2dcjQPHDcsI+svvdU3KERGZaUvH5IwDdzE+nGLAx1+ICxhr6cqU29zvWR6GHGOFp+fbWA==
   dependencies:
     chalk "^4.1.0"
@@ -1127,7 +1246,7 @@
 
 "@citation-js/cli@0.6.4":
   version "0.6.4"
-  resolved "https://registry.yarnpkg.com/@citation-js/cli/-/cli-0.6.4.tgz#ca55e46a8bb66ea57b596bab7d28cdc98e89a684"
+  resolved "https://registry.npmjs.org/@citation-js/cli/-/cli-0.6.4.tgz"
   integrity sha512-xzzIRyn7zRtdsvAKulBv1ermhwvVXUeOzjiB0BN3pRlPesDMv/OUN6vFCBqF8WXNld1dtNVoGnsQFEknGGwPeg==
   dependencies:
     "@citation-js/core" "^0.6.1"
@@ -1141,7 +1260,7 @@
 
 "@citation-js/core@0.6.1", "@citation-js/core@^0.6.1":
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@citation-js/core/-/core-0.6.1.tgz#6e6c7c6150a3aec93076b99cb8ae215cb876efc1"
+  resolved "https://registry.npmjs.org/@citation-js/core/-/core-0.6.1.tgz"
   integrity sha512-zvVxsAP4ciVHiZ60TmKTfjui4m6xeISSp/rtIhOcvZxZ70bBfkt83+kGnuI4xRlhB/oUrZN2fC9BSRKdivSobQ==
   dependencies:
     "@citation-js/date" "^0.5.0"
@@ -1151,17 +1270,17 @@
 
 "@citation-js/date@0.5.1", "@citation-js/date@^0.5.0":
   version "0.5.1"
-  resolved "https://registry.yarnpkg.com/@citation-js/date/-/date-0.5.1.tgz#5d4e3746ce6a66b467c94071284de1c38e9a4987"
+  resolved "https://registry.npmjs.org/@citation-js/date/-/date-0.5.1.tgz"
   integrity sha512-1iDKAZ4ie48PVhovsOXQ+C6o55dWJloXqtznnnKy6CltJBQLIuLLuUqa8zlIvma0ZigjVjgDUhnVaNU1MErtZw==
 
 "@citation-js/name@0.4.2", "@citation-js/name@^0.4.2":
   version "0.4.2"
-  resolved "https://registry.yarnpkg.com/@citation-js/name/-/name-0.4.2.tgz#8dc834b7e6c06998fc8d3b63632658754c94a875"
+  resolved "https://registry.npmjs.org/@citation-js/name/-/name-0.4.2.tgz"
   integrity sha512-brSPsjs2fOVzSnARLKu0qncn6suWjHVQtrqSUrnqyaRH95r/Ad4wPF5EsoWr+Dx8HzkCGb/ogmoAzfCsqlTwTQ==
 
 "@citation-js/plugin-bibjson@0.6.1", "@citation-js/plugin-bibjson@^0.6.1":
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@citation-js/plugin-bibjson/-/plugin-bibjson-0.6.1.tgz#cc900dea03256a82a6f446486e42f41a48fe72ce"
+  resolved "https://registry.npmjs.org/@citation-js/plugin-bibjson/-/plugin-bibjson-0.6.1.tgz"
   integrity sha512-5dv5DxHtM8JotLqyICbRZpmBwR9DWUQJio4mNBbHsf3INtk5rYOAOVpLjsBknDQBN+EI6ReanhswFZmxYHVdUg==
   dependencies:
     "@citation-js/date" "^0.5.0"
@@ -1169,7 +1288,7 @@
 
 "@citation-js/plugin-bibtex@0.6.1", "@citation-js/plugin-bibtex@^0.6.1":
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@citation-js/plugin-bibtex/-/plugin-bibtex-0.6.1.tgz#f024b8c2ca5e48d2315afa2f161dda40b99dfb76"
+  resolved "https://registry.npmjs.org/@citation-js/plugin-bibtex/-/plugin-bibtex-0.6.1.tgz"
   integrity sha512-JMw9h9MUXH7YWvgN0j+A5xI4Fw3cHYcDMzpweeAcXBfjfnC6q30Dyvs2YxfUxNEKvWDgRQjAiNNIzgWXs9uK1Q==
   dependencies:
     "@citation-js/date" "^0.5.0"
@@ -1178,7 +1297,7 @@
 
 "@citation-js/plugin-csl@0.6.4", "@citation-js/plugin-csl@^0.6.4":
   version "0.6.4"
-  resolved "https://registry.yarnpkg.com/@citation-js/plugin-csl/-/plugin-csl-0.6.4.tgz#c3d415a85650e959658a6546ee1a6e540492872b"
+  resolved "https://registry.npmjs.org/@citation-js/plugin-csl/-/plugin-csl-0.6.4.tgz"
   integrity sha512-RG4NrFIx0CZTfNeMCC8CL7UGFRiUv5/bNd/Nc6Q/NHx0cS/tYDQcKt0M24dpOI7PAZwVoddbDW4Iakn6nS4QsQ==
   dependencies:
     "@citation-js/date" "^0.5.0"
@@ -1186,14 +1305,14 @@
 
 "@citation-js/plugin-doi@0.6.1", "@citation-js/plugin-doi@^0.6.1":
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@citation-js/plugin-doi/-/plugin-doi-0.6.1.tgz#73de4e085a41f3cc6845e49cac47e5e891bd4a56"
+  resolved "https://registry.npmjs.org/@citation-js/plugin-doi/-/plugin-doi-0.6.1.tgz"
   integrity sha512-k5kMVIcWG9B2r8B5/QSSlGi8CMSShWSzcgX45Iksp9rz4MyM1BclWh4zNYm41yDYHCXYcSN7ZLIEfUt5DLgQ8A==
   dependencies:
     "@citation-js/date" "^0.5.0"
 
 "@citation-js/plugin-ris@0.6.2", "@citation-js/plugin-ris@^0.6.2":
   version "0.6.2"
-  resolved "https://registry.yarnpkg.com/@citation-js/plugin-ris/-/plugin-ris-0.6.2.tgz#abc64bf82533c3354c78264a3499c06d5569ad85"
+  resolved "https://registry.npmjs.org/@citation-js/plugin-ris/-/plugin-ris-0.6.2.tgz"
   integrity sha512-qW1k1DUzj8eWPh6Xg/pn999tSlMfAR2fwyFgyd1HalLVSNHUDvIJbJF4vq4mCWQYWQ+FKtN1x5ILd1A6bOss4g==
   dependencies:
     "@citation-js/date" "^0.5.0"
@@ -1201,7 +1320,7 @@
 
 "@citation-js/plugin-wikidata@0.6.4", "@citation-js/plugin-wikidata@^0.6.4":
   version "0.6.4"
-  resolved "https://registry.yarnpkg.com/@citation-js/plugin-wikidata/-/plugin-wikidata-0.6.4.tgz#621c23e30c26a8ae2f42f29c33b8258ac65ba60c"
+  resolved "https://registry.npmjs.org/@citation-js/plugin-wikidata/-/plugin-wikidata-0.6.4.tgz"
   integrity sha512-RTSwu2a6gytf/HYG2Yblg0Db8kZypGr9YxBPkyqRDY/gDVx2y3zPT7vfLdotsNxvn0Gbd8eQAAP+hoPkz+ODPw==
   dependencies:
     "@citation-js/date" "^0.5.0"
@@ -1210,12 +1329,12 @@
 
 "@colors/colors@1.5.0":
   version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
+  resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
 "@discoveryjs/json-ext@^0.5.0":
   version "0.5.7"
-  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
+  resolved "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"
   integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
 "@eslint/eslintrc@^1.3.3":
@@ -1238,62 +1357,62 @@
   resolved "https://registry.yarnpkg.com/@fontsource/atkinson-hyperlegible/-/atkinson-hyperlegible-4.5.10.tgz#7571e9d07acfc3c122d077c5c44be1c557c55a6d"
   integrity sha512-UyKTkEGQnF5lbAYRIPCeAikkVgBPQ8n3ve/cdJX1tp0Kma3pe7cZOVESEK2oyTZqn7Jt3ZS51hbY7hR8u4dLXA==
 
+"@fortawesome/fontawesome-common-types@6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.1.tgz#411e02a820744d3f7e0d8d9df9d82b471beaa073"
+  integrity sha512-Sz07mnQrTekFWLz5BMjOzHl/+NooTdW8F8kDQxjWwbpOJcnoSg4vUDng8d/WR1wOxM0O+CY9Zw0nR054riNYtQ==
+
 "@fortawesome/fontawesome-common-types@^0.2.36":
   version "0.2.36"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz#b44e52db3b6b20523e0c57ef8c42d315532cb903"
+  resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz"
   integrity sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==
 
-"@fortawesome/fontawesome-common-types@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.3.0.tgz#949995a05c0d8801be7e0a594f775f1dbaa0d893"
-  integrity sha512-CA3MAZBTxVsF6SkfkHXDerkhcQs0QPofy43eFdbWJJkZiq3SfiaH1msOkac59rQaqto5EqWnASboY1dBuKen5w==
-
 "@fortawesome/fontawesome-free@^5.15.4":
   version "5.15.4"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5"
+  resolved "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz"
   integrity sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==
 
-"@fortawesome/fontawesome-svg-core@^1.2.36":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.3.0.tgz#343fac91fa87daa630d26420bfedfba560f85885"
-  integrity sha512-UIL6crBWhjTNQcONt96ExjUnKt1D68foe3xjEensLDclqQ6YagwCRYVQdrp/hW0ALRp/5Fv/VKw+MqTUWYYvPg==
+"@fortawesome/fontawesome-svg-core@^6.2.1":
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.2.1.tgz#e87e905e444b5e7b715af09b64d27b53d4c8f9d9"
+  integrity sha512-HELwwbCz6C1XEcjzyT1Jugmz2NNklMrSPjZOWMlc+ZsHIVk+XOvOXLGGQtFBwSyqfJDNgRq4xBCwWOaZ/d9DEA==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.3.0"
+    "@fortawesome/fontawesome-common-types" "6.2.1"
 
 "@fortawesome/free-brands-svg-icons@^5.15.4":
   version "5.15.4"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.15.4.tgz#ec8a44dd383bcdd58aa7d1c96f38251e6fec9733"
+  resolved "https://registry.npmjs.org/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-5.15.4.tgz"
   integrity sha512-f1witbwycL9cTENJegcmcZRYyawAFbm8+c6IirLmwbbpqz46wyjbQYLuxOc7weXFXfB7QR8/Vd2u5R3q6JYD9g==
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.2.36"
 
 "@fortawesome/free-regular-svg-icons@^5.15.4":
   version "5.15.4"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.4.tgz#b97edab436954333bbeac09cfc40c6a951081a02"
+  resolved "https://registry.npmjs.org/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.4.tgz"
   integrity sha512-9VNNnU3CXHy9XednJ3wzQp6SwNwT3XaM26oS4Rp391GsxVYA+0oDR2J194YCIWf7jNRCYKjUCOduxdceLrx+xw==
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.2.36"
 
 "@fortawesome/free-solid-svg-icons@^5.15.4":
   version "5.15.4"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz#2a68f3fc3ddda12e52645654142b9e4e8fbb6cc5"
+  resolved "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz"
   integrity sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.2.36"
 
-"@fortawesome/vue-fontawesome@^2.0.6":
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.8.tgz#9c9ae1cd2cbe7f4b0c63dd53709c26167d541aa6"
-  integrity sha512-SRmP0q9Ox4zq8ydDR/hrH+23TVU1bdwYVnugLVaAIwklOHbf56gx6JUGlwES7zjuNYqzKgl8e39iYf6ph8qSQw==
+"@fortawesome/vue-fontawesome@^2.0.9":
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/@fortawesome/vue-fontawesome/-/vue-fontawesome-2.0.9.tgz#7df35818135be54fd87568f16ec7b998a3d0cce8"
+  integrity sha512-tUmO92PFHbLOplitjHNBVGMJm6S57vp16tBXJVPKSI/6CfjrgLycqKxEpC6f7qsOqUdoXs5nIv4HLUfrOMHzuw==
 
-"@handsontable/vue@^2.0.0-beta1":
+"@handsontable/vue@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@handsontable/vue/-/vue-2.0.0.tgz#28ae7d247a89738088abc32584562925dde18db0"
   integrity sha512-QVqJywrQWwJzoDCXibZkXrg+T91hNCTCN9qznmum4FSewL0MUtaHotv7Zc/D4scvEwpwWnKx5vpw4CY14V4OYw==
 
 "@hirez_io/observer-spy@^2.1.2":
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/@hirez_io/observer-spy/-/observer-spy-2.2.0.tgz#3b1df531ba333a9a6cbbec0333d3fbdc4c68cc3c"
+  resolved "https://registry.npmjs.org/@hirez_io/observer-spy/-/observer-spy-2.2.0.tgz"
   integrity sha512-G9nv87vjRILgB/X1AtKBv1DZX7yXSYAOCXon/f+QULKoXVhVehYUF5Lv0SQ97ebf1sA48Z2CyQ9h2v4Pz6DgaQ==
 
 "@humanwhocodes/config-array@^0.11.6":
@@ -1312,12 +1431,12 @@
 
 "@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
+  resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
+  resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"
   integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
   dependencies:
     camelcase "^5.3.1"
@@ -1328,125 +1447,140 @@
 
 "@istanbuljs/schema@^0.1.2":
   version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
+  resolved "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
 "@jedmao/location@^3.0.0":
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@jedmao/location/-/location-3.0.0.tgz#f2b24e937386f95252f3a1fefbf7ca2e0a4b87e9"
+  resolved "https://registry.npmjs.org/@jedmao/location/-/location-3.0.0.tgz"
   integrity sha512-p7mzNlgJbCioUYLUEKds3cQG4CHONVFJNYqMe6ocEtENCL/jYmMo1Q3ApwsMmU+L0ZkaDJEyv4HokaByLoPwlQ==
 
-"@jest/console@^27.5.1":
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-27.5.1.tgz#260fe7239602fe5130a94f1aa386eff54b014bba"
-  integrity sha512-kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg==
+"@jest/console@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-29.3.1.tgz#3e3f876e4e47616ea3b1464b9fbda981872e9583"
+  integrity sha512-IRE6GD47KwcqA09RIWrabKdHPiKDGgtAL31xDxbi/RjQMsr+lY+ppxmHwY0dUEV3qvvxZzoe5Hl0RXZJOjQNUg==
   dependencies:
-    "@jest/types" "^27.5.1"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^27.5.1"
-    jest-util "^27.5.1"
+    jest-message-util "^29.3.1"
+    jest-util "^29.3.1"
     slash "^3.0.0"
 
-"@jest/core@^27.5.1":
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-27.5.1.tgz#267ac5f704e09dc52de2922cbf3af9edcd64b626"
-  integrity sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==
+"@jest/core@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-29.3.1.tgz#bff00f413ff0128f4debec1099ba7dcd649774a1"
+  integrity sha512-0ohVjjRex985w5MmO5L3u5GR1O30DexhBSpuwx2P+9ftyqHdJXnk7IUWiP80oHMvt7ubHCJHxV0a0vlKVuZirw==
   dependencies:
-    "@jest/console" "^27.5.1"
-    "@jest/reporters" "^27.5.1"
-    "@jest/test-result" "^27.5.1"
-    "@jest/transform" "^27.5.1"
-    "@jest/types" "^27.5.1"
+    "@jest/console" "^29.3.1"
+    "@jest/reporters" "^29.3.1"
+    "@jest/test-result" "^29.3.1"
+    "@jest/transform" "^29.3.1"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    emittery "^0.8.1"
+    ci-info "^3.2.0"
     exit "^0.1.2"
     graceful-fs "^4.2.9"
-    jest-changed-files "^27.5.1"
-    jest-config "^27.5.1"
-    jest-haste-map "^27.5.1"
-    jest-message-util "^27.5.1"
-    jest-regex-util "^27.5.1"
-    jest-resolve "^27.5.1"
-    jest-resolve-dependencies "^27.5.1"
-    jest-runner "^27.5.1"
-    jest-runtime "^27.5.1"
-    jest-snapshot "^27.5.1"
-    jest-util "^27.5.1"
-    jest-validate "^27.5.1"
-    jest-watcher "^27.5.1"
+    jest-changed-files "^29.2.0"
+    jest-config "^29.3.1"
+    jest-haste-map "^29.3.1"
+    jest-message-util "^29.3.1"
+    jest-regex-util "^29.2.0"
+    jest-resolve "^29.3.1"
+    jest-resolve-dependencies "^29.3.1"
+    jest-runner "^29.3.1"
+    jest-runtime "^29.3.1"
+    jest-snapshot "^29.3.1"
+    jest-util "^29.3.1"
+    jest-validate "^29.3.1"
+    jest-watcher "^29.3.1"
     micromatch "^4.0.4"
-    rimraf "^3.0.0"
+    pretty-format "^29.3.1"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/environment@^27.5.1":
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-27.5.1.tgz#d7425820511fe7158abbecc010140c3fd3be9c74"
-  integrity sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==
+"@jest/environment@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-29.3.1.tgz#eb039f726d5fcd14698acd072ac6576d41cfcaa6"
+  integrity sha512-pMmvfOPmoa1c1QpfFW0nXYtNLpofqo4BrCIk6f2kW4JFeNlHV2t3vd+3iDLf31e2ot2Mec0uqZfmI+U0K2CFag==
   dependencies:
-    "@jest/fake-timers" "^27.5.1"
-    "@jest/types" "^27.5.1"
+    "@jest/fake-timers" "^29.3.1"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
-    jest-mock "^27.5.1"
+    jest-mock "^29.3.1"
 
-"@jest/fake-timers@^27.5.1":
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-27.5.1.tgz#76979745ce0579c8a94a4678af7a748eda8ada74"
-  integrity sha512-/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ==
+"@jest/expect-utils@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/expect-utils/-/expect-utils-29.3.1.tgz#531f737039e9b9e27c42449798acb5bba01935b6"
+  integrity sha512-wlrznINZI5sMjwvUoLVk617ll/UYfGIZNxmbU+Pa7wmkL4vYzhV9R2pwVqUh4NWWuLQWkI8+8mOkxs//prKQ3g==
   dependencies:
-    "@jest/types" "^27.5.1"
-    "@sinonjs/fake-timers" "^8.0.1"
+    jest-get-type "^29.2.0"
+
+"@jest/expect@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/expect/-/expect-29.3.1.tgz#456385b62894349c1d196f2d183e3716d4c6a6cd"
+  integrity sha512-QivM7GlSHSsIAWzgfyP8dgeExPRZ9BIe2LsdPyEhCGkZkoyA+kGsoIzbKAfZCvvRzfZioKwPtCZIt5SaoxYCvg==
+  dependencies:
+    expect "^29.3.1"
+    jest-snapshot "^29.3.1"
+
+"@jest/fake-timers@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-29.3.1.tgz#b140625095b60a44de820876d4c14da1aa963f67"
+  integrity sha512-iHTL/XpnDlFki9Tq0Q1GGuVeQ8BHZGIYsvCO5eN/O/oJaRzofG9Xndd9HuSDBI/0ZS79pg0iwn07OMTQ7ngF2A==
+  dependencies:
+    "@jest/types" "^29.3.1"
+    "@sinonjs/fake-timers" "^9.1.2"
     "@types/node" "*"
-    jest-message-util "^27.5.1"
-    jest-mock "^27.5.1"
-    jest-util "^27.5.1"
+    jest-message-util "^29.3.1"
+    jest-mock "^29.3.1"
+    jest-util "^29.3.1"
 
-"@jest/globals@^27.5.1":
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-27.5.1.tgz#7ac06ce57ab966566c7963431cef458434601b2b"
-  integrity sha512-ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q==
+"@jest/globals@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-29.3.1.tgz#92be078228e82d629df40c3656d45328f134a0c6"
+  integrity sha512-cTicd134vOcwO59OPaB6AmdHQMCtWOe+/DitpTZVxWgMJ+YvXL1HNAmPyiGbSHmF/mXVBkvlm8YYtQhyHPnV6Q==
   dependencies:
-    "@jest/environment" "^27.5.1"
-    "@jest/types" "^27.5.1"
-    expect "^27.5.1"
+    "@jest/environment" "^29.3.1"
+    "@jest/expect" "^29.3.1"
+    "@jest/types" "^29.3.1"
+    jest-mock "^29.3.1"
 
-"@jest/reporters@^27.5.1":
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-27.5.1.tgz#ceda7be96170b03c923c37987b64015812ffec04"
-  integrity sha512-cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw==
+"@jest/reporters@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-29.3.1.tgz#9a6d78c109608e677c25ddb34f907b90e07b4310"
+  integrity sha512-GhBu3YFuDrcAYW/UESz1JphEAbvUjaY2vShRZRoRY1mxpCMB3yGSJ4j9n0GxVlEOdCf7qjvUfBCrTUUqhVfbRA==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^27.5.1"
-    "@jest/test-result" "^27.5.1"
-    "@jest/transform" "^27.5.1"
-    "@jest/types" "^27.5.1"
+    "@jest/console" "^29.3.1"
+    "@jest/test-result" "^29.3.1"
+    "@jest/transform" "^29.3.1"
+    "@jest/types" "^29.3.1"
+    "@jridgewell/trace-mapping" "^0.3.15"
     "@types/node" "*"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
-    glob "^7.1.2"
+    glob "^7.1.3"
     graceful-fs "^4.2.9"
     istanbul-lib-coverage "^3.0.0"
     istanbul-lib-instrument "^5.1.0"
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
     istanbul-reports "^3.1.3"
-    jest-haste-map "^27.5.1"
-    jest-resolve "^27.5.1"
-    jest-util "^27.5.1"
-    jest-worker "^27.5.1"
+    jest-message-util "^29.3.1"
+    jest-util "^29.3.1"
+    jest-worker "^29.3.1"
     slash "^3.0.0"
-    source-map "^0.6.0"
     string-length "^4.0.1"
-    terminal-link "^2.0.0"
-    v8-to-istanbul "^8.1.0"
+    strip-ansi "^6.0.0"
+    v8-to-istanbul "^9.0.1"
 
 "@jest/schemas@^28.1.3":
   version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/schemas/-/schemas-28.1.3.tgz#ad8b86a66f11f33619e3d7e1dcddd7f2d40ff905"
+  resolved "https://registry.npmjs.org/@jest/schemas/-/schemas-28.1.3.tgz"
   integrity sha512-/l/VWsdt/aBXgjshLWOFyFt3IVdYypu5y2Wn2rOO1un6nkqIn8SLXzgIMYXFyYsRWDyF5EthmKJMIdJvk08grg==
   dependencies:
     "@sinclair/typebox" "^0.24.1"
@@ -1458,100 +1592,56 @@
   dependencies:
     "@sinclair/typebox" "^0.24.1"
 
-"@jest/source-map@^27.5.1":
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-27.5.1.tgz#6608391e465add4205eae073b55e7f279e04e8cf"
-  integrity sha512-y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg==
+"@jest/source-map@^29.2.0":
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-29.2.0.tgz#ab3420c46d42508dcc3dc1c6deee0b613c235744"
+  integrity sha512-1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.15"
     callsites "^3.0.0"
     graceful-fs "^4.2.9"
-    source-map "^0.6.0"
 
-"@jest/test-result@^27.5.1":
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-27.5.1.tgz#56a6585fa80f7cdab72b8c5fc2e871d03832f5bb"
-  integrity sha512-EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag==
+"@jest/test-result@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-29.3.1.tgz#92cd5099aa94be947560a24610aa76606de78f50"
+  integrity sha512-qeLa6qc0ddB0kuOZyZIhfN5q0e2htngokyTWsGriedsDhItisW7SDYZ7ceOe57Ii03sL988/03wAcBh3TChMGw==
   dependencies:
-    "@jest/console" "^27.5.1"
-    "@jest/types" "^27.5.1"
+    "@jest/console" "^29.3.1"
+    "@jest/types" "^29.3.1"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^27.5.1":
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-27.5.1.tgz#4057e0e9cea4439e544c6353c6affe58d095745b"
-  integrity sha512-LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ==
+"@jest/test-sequencer@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-29.3.1.tgz#fa24b3b050f7a59d48f7ef9e0b782ab65123090d"
+  integrity sha512-IqYvLbieTv20ArgKoAMyhLHNrVHJfzO6ARZAbQRlY4UGWfdDnLlZEF0BvKOMd77uIiIjSZRwq3Jb3Fa3I8+2UA==
   dependencies:
-    "@jest/test-result" "^27.5.1"
+    "@jest/test-result" "^29.3.1"
     graceful-fs "^4.2.9"
-    jest-haste-map "^27.5.1"
-    jest-runtime "^27.5.1"
-
-"@jest/transform@^27.5.1":
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-27.5.1.tgz#6c3501dcc00c4c08915f292a600ece5ecfe1f409"
-  integrity sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==
-  dependencies:
-    "@babel/core" "^7.1.0"
-    "@jest/types" "^27.5.1"
-    babel-plugin-istanbul "^6.1.1"
-    chalk "^4.0.0"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
-    graceful-fs "^4.2.9"
-    jest-haste-map "^27.5.1"
-    jest-regex-util "^27.5.1"
-    jest-util "^27.5.1"
-    micromatch "^4.0.4"
-    pirates "^4.0.4"
+    jest-haste-map "^29.3.1"
     slash "^3.0.0"
-    source-map "^0.6.1"
-    write-file-atomic "^3.0.0"
 
-"@jest/transform@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-28.1.3.tgz#59d8098e50ab07950e0f2fc0fc7ec462371281b0"
-  integrity sha512-u5dT5di+oFI6hfcLOHGTAfmUxFRrjK+vnaP0kkVow9Md/M7V/MxqQMOz/VV25UZO8pzeA9PjfTpOu6BDuwSPQA==
+"@jest/transform@^29.3.1":
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-29.3.1.tgz#1e6bd3da4af50b5c82a539b7b1f3770568d6e36d"
+  integrity sha512-8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug==
   dependencies:
     "@babel/core" "^7.11.6"
-    "@jest/types" "^28.1.3"
-    "@jridgewell/trace-mapping" "^0.3.13"
+    "@jest/types" "^29.3.1"
+    "@jridgewell/trace-mapping" "^0.3.15"
     babel-plugin-istanbul "^6.1.1"
     chalk "^4.0.0"
-    convert-source-map "^1.4.0"
-    fast-json-stable-stringify "^2.0.0"
+    convert-source-map "^2.0.0"
+    fast-json-stable-stringify "^2.1.0"
     graceful-fs "^4.2.9"
-    jest-haste-map "^28.1.3"
-    jest-regex-util "^28.0.2"
-    jest-util "^28.1.3"
+    jest-haste-map "^29.3.1"
+    jest-regex-util "^29.2.0"
+    jest-util "^29.3.1"
     micromatch "^4.0.4"
     pirates "^4.0.4"
     slash "^3.0.0"
     write-file-atomic "^4.0.1"
 
-"@jest/types@^27.5.1":
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-27.5.1.tgz#3c79ec4a8ba61c170bf937bcf9e98a9df175ec80"
-  integrity sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^16.0.0"
-    chalk "^4.0.0"
-
-"@jest/types@^28.1.3":
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-28.1.3.tgz#b05de80996ff12512bc5ceb1d208285a7d11748b"
-  integrity sha512-RyjiyMUZrKz/c+zlMFO1pm70DcIlST8AeWTkoUdZevew44wcNZQHsEVOiCVtgVnlFFD82FPaXycys58cf2muVQ==
-  dependencies:
-    "@jest/schemas" "^28.1.3"
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^3.0.0"
-    "@types/node" "*"
-    "@types/yargs" "^17.0.8"
-    chalk "^4.0.0"
-
 "@jest/types@^29.3.1":
   version "29.3.1"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-29.3.1.tgz#7c5a80777cb13e703aeec6788d044150341147e3"
@@ -1566,14 +1656,14 @@
 
 "@johmun/vue-tags-input@^2.1.0":
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@johmun/vue-tags-input/-/vue-tags-input-2.1.0.tgz#d265c00ecea092ecfcea21945f31c22a619e4862"
+  resolved "https://registry.npmjs.org/@johmun/vue-tags-input/-/vue-tags-input-2.1.0.tgz"
   integrity sha512-Fdwfss/TqCqMJbGAkmlzKbcG/ia1MstYjhqPBj+zG7h/166tIcE1TIftUxhT9LZ+RWjRSG0EFA1UyaHQSr3k3Q==
   dependencies:
     vue "^2.6.10"
 
 "@jridgewell/gen-mapping@^0.1.0":
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"
+  resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"
   integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
   dependencies:
     "@jridgewell/set-array" "^1.0.0"
@@ -1581,39 +1671,47 @@
 
 "@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
+  resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"
   integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
   dependencies:
     "@jridgewell/set-array" "^1.0.1"
     "@jridgewell/sourcemap-codec" "^1.4.10"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/resolve-uri@^3.0.3":
+"@jridgewell/resolve-uri@3.1.0", "@jridgewell/resolve-uri@^3.0.3":
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"
   integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
 
 "@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
+  resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"
   integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
 
 "@jridgewell/source-map@^0.3.2":
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
+  resolved "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz"
   integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
   dependencies:
     "@jridgewell/gen-mapping" "^0.3.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@jridgewell/sourcemap-codec@^1.4.10":
+"@jridgewell/sourcemap-codec@1.4.14", "@jridgewell/sourcemap-codec@^1.4.10":
   version "1.4.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"
   integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
 
-"@jridgewell/trace-mapping@^0.3.13", "@jridgewell/trace-mapping@^0.3.7":
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.15":
+  version "0.3.17"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz#793041277af9073b0951a7fe0f0d8c4c98c36985"
+  integrity sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==
+  dependencies:
+    "@jridgewell/resolve-uri" "3.1.0"
+    "@jridgewell/sourcemap-codec" "1.4.14"
+
+"@jridgewell/trace-mapping@^0.3.7":
   version "0.3.14"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
+  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz"
   integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
   dependencies:
     "@jridgewell/resolve-uri" "^3.0.3"
@@ -1629,22 +1727,22 @@
 
 "@leichtgewicht/ip-codec@^2.0.1":
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz#b2ac626d6cb9c8718ab459166d4bb405b8ffa78b"
+  resolved "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz"
   integrity sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==
 
 "@mdn/browser-compat-data@^3.3.14":
   version "3.3.14"
-  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-3.3.14.tgz#b72a37c654e598f9ae6f8335faaee182bebc6b28"
+  resolved "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-3.3.14.tgz"
   integrity sha512-n2RC9d6XatVbWFdHLimzzUJxJ1KY8LdjqrW6YvGPiRmsHkhOUx74/Ct10x5Yo7bC/Jvqx7cDEW8IMPv/+vwEzA==
 
 "@mdn/browser-compat-data@^4.1.5":
   version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-4.2.1.tgz#1fead437f3957ceebe2e8c3f46beccdb9bc575b8"
+  resolved "https://registry.npmjs.org/@mdn/browser-compat-data/-/browser-compat-data-4.2.1.tgz"
   integrity sha512-EWUguj2kd7ldmrF9F+vI5hUOralPd+sdsUnYbRy33vZTuZkduC1shE9TtEMEjAQwyfyMb4ole5KtjF8MsnQOlA==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
   integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
   dependencies:
     "@nodelib/fs.stat" "2.0.5"
@@ -1652,12 +1750,12 @@
 
 "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
 "@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
   dependencies:
     "@nodelib/fs.scandir" "2.1.5"
@@ -1665,21 +1763,28 @@
 
 "@nuxt/opencollective@^0.3.2":
   version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@nuxt/opencollective/-/opencollective-0.3.3.tgz#80ff0eb8f6fca1d0ed5a089b9688f41bff2dd8ab"
+  resolved "https://registry.npmjs.org/@nuxt/opencollective/-/opencollective-0.3.3.tgz"
   integrity sha512-6IKCd+gP0HliixqZT/p8nW3tucD6Sv/u/eR2A9X4rxT/6hXlMzA4GZQzq4d2qnBAwSwGpmKyzkyTjNjrhaA25A==
   dependencies:
     chalk "^4.1.0"
     consola "^2.15.0"
     node-fetch "^2.6.7"
 
+"@pinia/testing@^0.0.14":
+  version "0.0.14"
+  resolved "https://registry.yarnpkg.com/@pinia/testing/-/testing-0.0.14.tgz#774791df360a1949c9ea2d8665de35d5a0200251"
+  integrity sha512-ZmZwVNd/NnKYLIfjfuKl0zlJ3UdiXFpsHzSlL6wCeezSlyrqGMxsIQKv0J6fleu38gyCNTPBEipfxrt8V4+VIg==
+  dependencies:
+    vue-demi "*"
+
 "@popperjs/core@^2.11.5":
   version "2.11.5"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64"
+  resolved "https://registry.npmjs.org/@popperjs/core/-/core-2.11.5.tgz"
   integrity sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw==
 
 "@sentry/browser@^6.17.4":
   version "6.19.7"
-  resolved "https://registry.yarnpkg.com/@sentry/browser/-/browser-6.19.7.tgz#a40b6b72d911b5f1ed70ed3b4e7d4d4e625c0b5f"
+  resolved "https://registry.npmjs.org/@sentry/browser/-/browser-6.19.7.tgz"
   integrity sha512-oDbklp4O3MtAM4mtuwyZLrgO1qDVYIujzNJQzXmi9YzymJCuzMLSRDvhY83NNDCRxf0pds4DShgYeZdbSyKraA==
   dependencies:
     "@sentry/core" "6.19.7"
@@ -1689,7 +1794,7 @@
 
 "@sentry/core@6.19.7":
   version "6.19.7"
-  resolved "https://registry.yarnpkg.com/@sentry/core/-/core-6.19.7.tgz#156aaa56dd7fad8c89c145be6ad7a4f7209f9785"
+  resolved "https://registry.npmjs.org/@sentry/core/-/core-6.19.7.tgz"
   integrity sha512-tOfZ/umqB2AcHPGbIrsFLcvApdTm9ggpi/kQZFkej7kMphjT+SGBiQfYtjyg9jcRW+ilAR4JXC9BGKsdEQ+8Vw==
   dependencies:
     "@sentry/hub" "6.19.7"
@@ -1700,7 +1805,7 @@
 
 "@sentry/hub@6.19.7":
   version "6.19.7"
-  resolved "https://registry.yarnpkg.com/@sentry/hub/-/hub-6.19.7.tgz#58ad7776bbd31e9596a8ec46365b45cd8b9cfd11"
+  resolved "https://registry.npmjs.org/@sentry/hub/-/hub-6.19.7.tgz"
   integrity sha512-y3OtbYFAqKHCWezF0EGGr5lcyI2KbaXW2Ik7Xp8Mu9TxbSTuwTe4rTntwg8ngPjUQU3SUHzgjqVB8qjiGqFXCA==
   dependencies:
     "@sentry/types" "6.19.7"
@@ -1709,7 +1814,7 @@
 
 "@sentry/minimal@6.19.7":
   version "6.19.7"
-  resolved "https://registry.yarnpkg.com/@sentry/minimal/-/minimal-6.19.7.tgz#b3ee46d6abef9ef3dd4837ebcb6bdfd01b9aa7b4"
+  resolved "https://registry.npmjs.org/@sentry/minimal/-/minimal-6.19.7.tgz"
   integrity sha512-wcYmSJOdvk6VAPx8IcmZgN08XTXRwRtB1aOLZm+MVHjIZIhHoBGZJYTVQS/BWjldsamj2cX3YGbGXNunaCfYJQ==
   dependencies:
     "@sentry/hub" "6.19.7"
@@ -1718,12 +1823,12 @@
 
 "@sentry/types@6.19.7":
   version "6.19.7"
-  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.19.7.tgz#c6b337912e588083fc2896eb012526cf7cfec7c7"
+  resolved "https://registry.npmjs.org/@sentry/types/-/types-6.19.7.tgz"
   integrity sha512-jH84pDYE+hHIbVnab3Hr+ZXr1v8QABfhx39KknxqKWr2l0oEItzepV0URvbEhB446lk/S/59230dlUUIBGsXbg==
 
 "@sentry/utils@6.19.7":
   version "6.19.7"
-  resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-6.19.7.tgz#6edd739f8185fd71afe49cbe351c1bbf5e7b7c79"
+  resolved "https://registry.npmjs.org/@sentry/utils/-/utils-6.19.7.tgz"
   integrity sha512-z95ECmE3i9pbWoXQrD/7PgkBAzJYR+iXtPuTkpBjDKs86O3mT+PXOT3BAn79w2wkn7/i3vOGD2xVr1uiMl26dA==
   dependencies:
     "@sentry/types" "6.19.7"
@@ -1731,33 +1836,26 @@
 
 "@sinclair/typebox@^0.24.1":
   version "0.24.27"
-  resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.27.tgz#d55643516a1546174e10da681a8aaa81e757452d"
+  resolved "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.24.27.tgz"
   integrity sha512-K7C7IlQ3zLePEZleUN21ceBA2aLcMnLHTLph8QWk1JK37L90obdpY+QGY8bXMKxf1ht1Z0MNewvXxWv0oGDYFg==
 
 "@sinonjs/commons@^1.6.0", "@sinonjs/commons@^1.7.0", "@sinonjs/commons@^1.8.3":
   version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
+  resolved "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.3.tgz"
   integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
   dependencies:
     type-detect "4.0.8"
 
 "@sinonjs/fake-timers@>=5", "@sinonjs/fake-timers@^9.1.2":
   version "9.1.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz#4eaab737fab77332ab132d396a3c0d364bd0ea8c"
+  resolved "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-9.1.2.tgz"
   integrity sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@sinonjs/fake-timers@^8.0.1":
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-8.1.0.tgz#3fdc2b6cb58935b21bfb8d1625eb1300484316e7"
-  integrity sha512-OAPJUAtgeINhh/TAlUID4QTs53Njm7xzddaVlEs/SXwgtiD1tW22zAB/W1wdqfrpmikgaWQ9Fw6Ws+hsiRm5Vg==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-
 "@sinonjs/samsam@^6.1.1":
   version "6.1.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-6.1.1.tgz#627f7f4cbdb56e6419fa2c1a3e4751ce4f6a00b1"
+  resolved "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-6.1.1.tgz"
   integrity sha512-cZ7rKJTLiE7u7Wi/v9Hc2fs3Ucc3jrWeMgPHbbTCeVAB2S0wOBbYlkJVeNSL04i7fdhT8wIbDq1zhC/PXTD2SA==
   dependencies:
     "@sinonjs/commons" "^1.6.0"
@@ -1766,12 +1864,12 @@
 
 "@sinonjs/text-encoding@^0.7.1":
   version "0.7.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz#5981a8db18b56ba38ef0efb7d995b12aa7b51918"
+  resolved "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.2.tgz"
   integrity sha512-sXXKG+uL9IrKqViTtao2Ws6dy0znu9sOaP1di/jKGW1M6VssO8vlpXCQcpZ+jisQ1tTFAC5Jo/EOzFbggBagFQ==
 
 "@testing-library/jest-dom@^5.16.4":
   version "5.16.5"
-  resolved "https://registry.yarnpkg.com/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz#3912846af19a29b2dbf32a6ae9c31ef52580074e"
+  resolved "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz"
   integrity sha512-N5ixQ2qKpi5OLYfwQmUb/5mSV9LneAcaUfp32pn4yCnpb8r/Yz0pXFPck21dIicKmi+ta5WRAknkZCfA8refMA==
   dependencies:
     "@adobe/css-tools" "^4.0.1"
@@ -1784,19 +1882,19 @@
     lodash "^4.17.15"
     redent "^3.0.0"
 
-"@tootallnate/once@1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
-  integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
+"@tootallnate/once@2":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
 "@trysound/sax@0.2.0":
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
+  resolved "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz"
   integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
 
-"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14":
+"@types/babel__core@^7.1.14":
   version "7.1.19"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460"
+  resolved "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz"
   integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==
   dependencies:
     "@babel/parser" "^7.1.0"
@@ -1807,29 +1905,29 @@
 
 "@types/babel__generator@*":
   version "7.6.4"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.4.tgz#1f20ce4c5b1990b37900b63f050182d28c2439b7"
+  resolved "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.4.tgz"
   integrity sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==
   dependencies:
     "@babel/types" "^7.0.0"
 
 "@types/babel__template@*":
   version "7.4.1"
-  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"
+  resolved "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.1.tgz"
   integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
   version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.0.tgz#8134fd78cb39567465be65b9fdc16d378095f41f"
+  resolved "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.18.0.tgz"
   integrity sha512-v4Vwdko+pgymgS+A2UIaJru93zQd85vIGWObM5ekZNdXCKtDYqATlEYnWgfo86Q6I1Lh0oXnksDnMU1cwmlPDw==
   dependencies:
     "@babel/types" "^7.3.0"
 
 "@types/body-parser@*":
   version "1.19.2"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
+  resolved "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz"
   integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
   dependencies:
     "@types/connect" "*"
@@ -1837,24 +1935,24 @@
 
 "@types/bonjour@^3.5.9":
   version "3.5.10"
-  resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275"
+  resolved "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz"
   integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==
   dependencies:
     "@types/node" "*"
 
 "@types/circular-json@^0.4.0":
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@types/circular-json/-/circular-json-0.4.0.tgz#7401f7e218cfe87ad4c43690da5658b9acaf51be"
+  resolved "https://registry.npmjs.org/@types/circular-json/-/circular-json-0.4.0.tgz"
   integrity sha512-7+kYB7x5a7nFWW1YPBh3KxhwKfiaI4PbZ1RvzBU91LZy7lWJO822CI+pqzSre/DZ7KsCuMKdHnLHHFu8AyXbQg==
 
 "@types/component-emitter@^1.2.10":
   version "1.2.11"
-  resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.11.tgz#50d47d42b347253817a39709fef03ce66a108506"
+  resolved "https://registry.npmjs.org/@types/component-emitter/-/component-emitter-1.2.11.tgz"
   integrity sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==
 
 "@types/connect-history-api-fallback@^1.3.5":
   version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"
+  resolved "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz"
   integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==
   dependencies:
     "@types/express-serve-static-core" "*"
@@ -1862,24 +1960,234 @@
 
 "@types/connect@*":
   version "3.4.35"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
+  resolved "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz"
   integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
   dependencies:
     "@types/node" "*"
 
 "@types/cookie@^0.4.1":
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
+  resolved "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz"
   integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
 
 "@types/cors@^2.8.12":
   version "2.8.12"
-  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
+  resolved "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz"
   integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
 
+"@types/d3-array@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/d3-array/-/d3-array-3.0.3.tgz#87d990bf504d14ad6b16766979d04e943c046dac"
+  integrity sha512-Reoy+pKnvsksN0lQUlcH6dOGjRZ/3WRwXR//m+/8lt1BXeI4xyaUZoqULNjyXXRuh0Mj4LNpkCvhUpQlY3X5xQ==
+
+"@types/d3-axis@*":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-axis/-/d3-axis-3.0.1.tgz#6afc20744fa5cc0cbc3e2bd367b140a79ed3e7a8"
+  integrity sha512-zji/iIbdd49g9WN0aIsGcwcTBUkgLsCSwB+uH+LPVDAiKWENMtI3cJEWt+7/YYwelMoZmbBfzA3qCdrZ2XFNnw==
+  dependencies:
+    "@types/d3-selection" "*"
+
+"@types/d3-brush@*":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-brush/-/d3-brush-3.0.1.tgz#ae5f17ce391935ca88b29000e60ee20452c6357c"
+  integrity sha512-B532DozsiTuQMHu2YChdZU0qsFJSio3Q6jmBYGYNp3gMDzBmuFFgPt9qKA4VYuLZMp4qc6eX7IUFUEsvHiXZAw==
+  dependencies:
+    "@types/d3-selection" "*"
+
+"@types/d3-chord@*":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-chord/-/d3-chord-3.0.1.tgz#54c8856c19c8e4ab36a53f73ba737de4768ad248"
+  integrity sha512-eQfcxIHrg7V++W8Qxn6QkqBNBokyhdWSAS73AbkbMzvLQmVVBviknoz2SRS/ZJdIOmhcmmdCRE/NFOm28Z1AMw==
+
+"@types/d3-color@*":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@types/d3-color/-/d3-color-3.1.0.tgz#6594da178ded6c7c3842f3cc0ac84b156f12f2d4"
+  integrity sha512-HKuicPHJuvPgCD+np6Se9MQvS6OCbJmOjGvylzMJRlDwUXjKTTXs6Pwgk79O09Vj/ho3u1ofXnhFOaEWWPrlwA==
+
+"@types/d3-contour@*":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-contour/-/d3-contour-3.0.1.tgz#9ff4e2fd2a3910de9c5097270a7da8a6ef240017"
+  integrity sha512-C3zfBrhHZvrpAAK3YXqLWVAGo87A4SvJ83Q/zVJ8rFWJdKejUnDYaWZPkA8K84kb2vDA/g90LTQAz7etXcgoQQ==
+  dependencies:
+    "@types/d3-array" "*"
+    "@types/geojson" "*"
+
+"@types/d3-delaunay@*":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-delaunay/-/d3-delaunay-6.0.1.tgz#006b7bd838baec1511270cb900bf4fc377bbbf41"
+  integrity sha512-tLxQ2sfT0p6sxdG75c6f/ekqxjyYR0+LwPrsO1mbC9YDBzPJhs2HbJJRrn8Ez1DBoHRo2yx7YEATI+8V1nGMnQ==
+
+"@types/d3-dispatch@*":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-dispatch/-/d3-dispatch-3.0.1.tgz#a1b18ae5fa055a6734cb3bd3cbc6260ef19676e3"
+  integrity sha512-NhxMn3bAkqhjoxabVJWKryhnZXXYYVQxaBnbANu0O94+O/nX9qSjrA1P1jbAQJxJf+VC72TxDX/YJcKue5bRqw==
+
+"@types/d3-drag@*":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-drag/-/d3-drag-3.0.1.tgz#fb1e3d5cceeee4d913caa59dedf55c94cb66e80f"
+  integrity sha512-o1Va7bLwwk6h03+nSM8dpaGEYnoIG19P0lKqlic8Un36ymh9NSkNFX1yiXMKNMx8rJ0Kfnn2eovuFaL6Jvj0zA==
+  dependencies:
+    "@types/d3-selection" "*"
+
+"@types/d3-dsv@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/d3-dsv/-/d3-dsv-3.0.0.tgz#f3c61fb117bd493ec0e814856feb804a14cfc311"
+  integrity sha512-o0/7RlMl9p5n6FQDptuJVMxDf/7EDEv2SYEO/CwdG2tr1hTfUVi0Iavkk2ax+VpaQ/1jVhpnj5rq1nj8vwhn2A==
+
+"@types/d3-ease@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/d3-ease/-/d3-ease-3.0.0.tgz#c29926f8b596f9dadaeca062a32a45365681eae0"
+  integrity sha512-aMo4eaAOijJjA6uU+GIeW018dvy9+oH5Y2VPPzjjfxevvGQ/oRDs+tfYC9b50Q4BygRR8yE2QCLsrT0WtAVseA==
+
+"@types/d3-fetch@*":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-fetch/-/d3-fetch-3.0.1.tgz#f9fa88b81aa2eea5814f11aec82ecfddbd0b8fe0"
+  integrity sha512-toZJNOwrOIqz7Oh6Q7l2zkaNfXkfR7mFSJvGvlD/Ciq/+SQ39d5gynHJZ/0fjt83ec3WL7+u3ssqIijQtBISsw==
+  dependencies:
+    "@types/d3-dsv" "*"
+
+"@types/d3-force@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/d3-force/-/d3-force-3.0.3.tgz#76cb20d04ae798afede1ea6e41750763ff5a9c82"
+  integrity sha512-z8GteGVfkWJMKsx6hwC3SiTSLspL98VNpmvLpEFJQpZPq6xpA1I8HNBDNSpukfK0Vb0l64zGFhzunLgEAcBWSA==
+
+"@types/d3-format@*":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-format/-/d3-format-3.0.1.tgz#194f1317a499edd7e58766f96735bdc0216bb89d"
+  integrity sha512-5KY70ifCCzorkLuIkDe0Z9YTf9RR2CjBX1iaJG+rgM/cPP+sO+q9YdQ9WdhQcgPj1EQiJ2/0+yUkkziTG6Lubg==
+
+"@types/d3-geo@*":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-geo/-/d3-geo-3.0.2.tgz#e7ec5f484c159b2c404c42d260e6d99d99f45d9a"
+  integrity sha512-DbqK7MLYA8LpyHQfv6Klz0426bQEf7bRTvhMy44sNGVyZoWn//B0c+Qbeg8Osi2Obdc9BLLXYAKpyWege2/7LQ==
+  dependencies:
+    "@types/geojson" "*"
+
+"@types/d3-hierarchy@*":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@types/d3-hierarchy/-/d3-hierarchy-3.1.0.tgz#4561bb7ace038f247e108295ef77b6a82193ac25"
+  integrity sha512-g+sey7qrCa3UbsQlMZZBOHROkFqx7KZKvUpRzI/tAp/8erZWpYq7FgNKvYwebi2LaEiVs1klhUfd3WCThxmmWQ==
+
+"@types/d3-interpolate@*":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-interpolate/-/d3-interpolate-3.0.1.tgz#e7d17fa4a5830ad56fe22ce3b4fac8541a9572dc"
+  integrity sha512-jx5leotSeac3jr0RePOH1KdR9rISG91QIE4Q2PYTu4OymLTZfA3SrnURSLzKH48HmXVUru50b8nje4E79oQSQw==
+  dependencies:
+    "@types/d3-color" "*"
+
+"@types/d3-path@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/d3-path/-/d3-path-3.0.0.tgz#939e3a784ae4f80b1fde8098b91af1776ff1312b"
+  integrity sha512-0g/A+mZXgFkQxN3HniRDbXMN79K3CdTpLsevj+PXiTcb2hVyvkZUBg37StmgCQkaD84cUJ4uaDAWq7UJOQy2Tg==
+
+"@types/d3-polygon@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/d3-polygon/-/d3-polygon-3.0.0.tgz#5200a3fa793d7736fa104285fa19b0dbc2424b93"
+  integrity sha512-D49z4DyzTKXM0sGKVqiTDTYr+DHg/uxsiWDAkNrwXYuiZVd9o9wXZIo+YsHkifOiyBkmSWlEngHCQme54/hnHw==
+
+"@types/d3-quadtree@*":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-quadtree/-/d3-quadtree-3.0.2.tgz#433112a178eb7df123aab2ce11c67f51cafe8ff5"
+  integrity sha512-QNcK8Jguvc8lU+4OfeNx+qnVy7c0VrDJ+CCVFS9srBo2GL9Y18CnIxBdTF3v38flrGy5s1YggcoAiu6s4fLQIw==
+
+"@types/d3-random@*":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-random/-/d3-random-3.0.1.tgz#5c8d42b36cd4c80b92e5626a252f994ca6bfc953"
+  integrity sha512-IIE6YTekGczpLYo/HehAy3JGF1ty7+usI97LqraNa8IiDur+L44d0VOjAvFQWJVdZOJHukUJw+ZdZBlgeUsHOQ==
+
+"@types/d3-scale-chromatic@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz#103124777e8cdec85b20b51fd3397c682ee1e954"
+  integrity sha512-dsoJGEIShosKVRBZB0Vo3C8nqSDqVGujJU6tPznsBJxNJNwMF8utmS83nvCBKQYPpjCzaaHcrf66iTRpZosLPw==
+
+"@types/d3-scale@*":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-scale/-/d3-scale-4.0.2.tgz#41be241126af4630524ead9cb1008ab2f0f26e69"
+  integrity sha512-Yk4htunhPAwN0XGlIwArRomOjdoBFXC3+kCxK2Ubg7I9shQlVSJy/pG/Ht5ASN+gdMIalpk8TJ5xV74jFsetLA==
+  dependencies:
+    "@types/d3-time" "*"
+
+"@types/d3-selection@*":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/d3-selection/-/d3-selection-3.0.3.tgz#57be7da68e7d9c9b29efefd8ea5a9ef1171e42ba"
+  integrity sha512-Mw5cf6nlW1MlefpD9zrshZ+DAWL4IQ5LnWfRheW6xwsdaWOb6IRRu2H7XPAQcyXEx1D7XQWgdoKR83ui1/HlEA==
+
+"@types/d3-shape@*":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@types/d3-shape/-/d3-shape-3.1.0.tgz#1d87a6ddcf28285ef1e5c278ca4bdbc0658f3505"
+  integrity sha512-jYIYxFFA9vrJ8Hd4Se83YI6XF+gzDL1aC5DCsldai4XYYiVNdhtpGbA/GM6iyQ8ayhSp3a148LY34hy7A4TxZA==
+  dependencies:
+    "@types/d3-path" "*"
+
+"@types/d3-time-format@*":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@types/d3-time-format/-/d3-time-format-4.0.0.tgz#ee7b6e798f8deb2d9640675f8811d0253aaa1946"
+  integrity sha512-yjfBUe6DJBsDin2BMIulhSHmr5qNR5Pxs17+oW4DoVPyVIXZ+m6bs7j1UVKP08Emv6jRmYrYqxYzO63mQxy1rw==
+
+"@types/d3-time@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/d3-time/-/d3-time-3.0.0.tgz#e1ac0f3e9e195135361fa1a1d62f795d87e6e819"
+  integrity sha512-sZLCdHvBUcNby1cB6Fd3ZBrABbjz3v1Vm90nysCQ6Vt7vd6e/h9Lt7SiJUoEX0l4Dzc7P5llKyhqSi1ycSf1Hg==
+
+"@types/d3-timer@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/d3-timer/-/d3-timer-3.0.0.tgz#e2505f1c21ec08bda8915238e397fb71d2fc54ce"
+  integrity sha512-HNB/9GHqu7Fo8AQiugyJbv6ZxYz58wef0esl4Mv828w1ZKpAshw/uFWVDUcIB9KKFeFKoxS3cHY07FFgtTRZ1g==
+
+"@types/d3-transition@*":
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/@types/d3-transition/-/d3-transition-3.0.2.tgz#393dc3e3d55009a43cc6f252e73fccab6d78a8a4"
+  integrity sha512-jo5o/Rf+/u6uerJ/963Dc39NI16FQzqwOc54bwvksGAdVfvDrqDpVeq95bEvPtBwLCVZutAEyAtmSyEMxN7vxQ==
+  dependencies:
+    "@types/d3-selection" "*"
+
+"@types/d3-zoom@*":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@types/d3-zoom/-/d3-zoom-3.0.1.tgz#4bfc7e29625c4f79df38e2c36de52ec3e9faf826"
+  integrity sha512-7s5L9TjfqIYQmQQEUcpMAcBOahem7TRoSO/+Gkz02GbMVuULiZzjF2BOdw291dbO2aNon4m2OdFsRGaCq2caLQ==
+  dependencies:
+    "@types/d3-interpolate" "*"
+    "@types/d3-selection" "*"
+
+"@types/d3@^7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@types/d3/-/d3-7.4.0.tgz#fc5cac5b1756fc592a3cf1f3dc881bf08225f515"
+  integrity sha512-jIfNVK0ZlxcuRDKtRS/SypEyOQ6UHaFQBKv032X45VvxSJ6Yi5G9behy9h6tNTHTDGh5Vq+KbmBjUWLgY4meCA==
+  dependencies:
+    "@types/d3-array" "*"
+    "@types/d3-axis" "*"
+    "@types/d3-brush" "*"
+    "@types/d3-chord" "*"
+    "@types/d3-color" "*"
+    "@types/d3-contour" "*"
+    "@types/d3-delaunay" "*"
+    "@types/d3-dispatch" "*"
+    "@types/d3-drag" "*"
+    "@types/d3-dsv" "*"
+    "@types/d3-ease" "*"
+    "@types/d3-fetch" "*"
+    "@types/d3-force" "*"
+    "@types/d3-format" "*"
+    "@types/d3-geo" "*"
+    "@types/d3-hierarchy" "*"
+    "@types/d3-interpolate" "*"
+    "@types/d3-path" "*"
+    "@types/d3-polygon" "*"
+    "@types/d3-quadtree" "*"
+    "@types/d3-random" "*"
+    "@types/d3-scale" "*"
+    "@types/d3-scale-chromatic" "*"
+    "@types/d3-selection" "*"
+    "@types/d3-shape" "*"
+    "@types/d3-time" "*"
+    "@types/d3-time-format" "*"
+    "@types/d3-timer" "*"
+    "@types/d3-transition" "*"
+    "@types/d3-zoom" "*"
+
 "@types/eslint-scope@^3.7.3":
   version "3.7.4"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
+  resolved "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz"
   integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
   dependencies:
     "@types/eslint" "*"
@@ -1887,7 +2195,7 @@
 
 "@types/eslint@*":
   version "8.4.5"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.5.tgz#acdfb7dd36b91cc5d812d7c093811a8f3d9b31e4"
+  resolved "https://registry.npmjs.org/@types/eslint/-/eslint-8.4.5.tgz"
   integrity sha512-dhsC09y1gpJWnK+Ff4SGvCuSnk9DaU0BJZSzOwa6GVSg65XtTugLBITDAAzRU5duGBoXBHpdR/9jHGxJjNflJQ==
   dependencies:
     "@types/estree" "*"
@@ -1895,17 +2203,17 @@
 
 "@types/estree@*":
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2"
+  resolved "https://registry.npmjs.org/@types/estree/-/estree-1.0.0.tgz"
   integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==
 
 "@types/estree@^0.0.51":
   version "0.0.51"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
+  resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz"
   integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
 
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
   version "4.17.30"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz#0f2f99617fa8f9696170c46152ccf7500b34ac04"
+  resolved "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.30.tgz"
   integrity sha512-gstzbTWro2/nFed1WXtf+TtrpwxH7Ggs4RLYTLbeVgIkUQOI3WG/JKjgeOU1zXDvezllupjrf8OPIdvTbIaVOQ==
   dependencies:
     "@types/node" "*"
@@ -1914,7 +2222,7 @@
 
 "@types/express@*", "@types/express@^4.17.13":
   version "4.17.13"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
+  resolved "https://registry.npmjs.org/@types/express/-/express-4.17.13.tgz"
   integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
   dependencies:
     "@types/body-parser" "*"
@@ -1922,90 +2230,104 @@
     "@types/qs" "*"
     "@types/serve-static" "*"
 
-"@types/graceful-fs@^4.1.2", "@types/graceful-fs@^4.1.3":
+"@types/geojson@*":
+  version "7946.0.10"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.10.tgz#6dfbf5ea17142f7f9a043809f1cd4c448cb68249"
+  integrity sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA==
+
+"@types/graceful-fs@^4.1.3":
   version "4.1.5"
-  resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15"
+  resolved "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.5.tgz"
   integrity sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==
   dependencies:
     "@types/node" "*"
 
 "@types/http-proxy@^1.17.8":
   version "1.17.9"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.9.tgz#7f0e7931343761efde1e2bf48c40f02f3f75705a"
+  resolved "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz"
   integrity sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==
   dependencies:
     "@types/node" "*"
 
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44"
+  resolved "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz"
   integrity sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==
 
 "@types/istanbul-lib-report@*":
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#c14c24f18ea8190c118ee7562b7ff99a36552686"
+  resolved "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"
   integrity sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==
   dependencies:
     "@types/istanbul-lib-coverage" "*"
 
 "@types/istanbul-reports@^3.0.0":
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
+  resolved "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz"
   integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
   dependencies:
     "@types/istanbul-lib-report" "*"
 
 "@types/jest@*":
   version "28.1.6"
-  resolved "https://registry.yarnpkg.com/@types/jest/-/jest-28.1.6.tgz#d6a9cdd38967d2d746861fb5be6b120e38284dd4"
+  resolved "https://registry.npmjs.org/@types/jest/-/jest-28.1.6.tgz"
   integrity sha512-0RbGAFMfcBJKOmqRazM8L98uokwuwD5F8rHrv/ZMbrZBwVOWZUyPG6VFNscjYr/vjM3Vu4fRrCPbOs42AfemaQ==
   dependencies:
     jest-matcher-utils "^28.0.0"
     pretty-format "^28.0.0"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+"@types/jsdom@^20.0.0":
+  version "20.0.1"
+  resolved "https://registry.yarnpkg.com/@types/jsdom/-/jsdom-20.0.1.tgz#07c14bc19bd2f918c1929541cdaacae894744808"
+  integrity sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==
+  dependencies:
+    "@types/node" "*"
+    "@types/tough-cookie" "*"
+    parse5 "^7.0.0"
+
+"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
   version "7.0.11"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
+  resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"
   integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
 
 "@types/mime@*":
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10"
+  resolved "https://registry.npmjs.org/@types/mime/-/mime-3.0.1.tgz"
   integrity sha512-Y4XFY5VJAuw0FgAqPNd6NNoV44jbq9Bz2L7Rh/J6jLTiHBSBJa9fxqQIvkIld4GsoDOcCbvzOUAbLPsSKKg+uA==
 
 "@types/node@*", "@types/node@>=10.0.0":
-  version "18.11.9"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.9.tgz#02d013de7058cea16d36168ef2fc653464cfbad4"
-  integrity sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==
+  version "18.6.5"
+  resolved "https://registry.npmjs.org/@types/node/-/node-18.6.5.tgz"
+  integrity sha512-Xjt5ZGUa5WusGZJ4WJPbOT8QOqp6nDynVFRKcUt32bOgvXEoc6o085WNkYTMO7ifAj2isEfQQ2cseE+wT6jsRw==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
+  resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
 "@types/prettier@^2.1.5":
   version "2.7.0"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.0.tgz#ea03e9f0376a4446f44797ca19d9c46c36e352dc"
+  resolved "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.0.tgz"
   integrity sha512-RI1L7N4JnW5gQw2spvL7Sllfuf1SaHdrZpCHiBlCXjIlufi1SMNnbu2teze3/QE67Fg2tBlH7W+mi4hVNk4p0A==
 
 "@types/qs@*":
   version "6.9.7"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
+  resolved "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz"
   integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
 
 "@types/raf@^3.4.0":
   version "3.4.0"
-  resolved "https://registry.yarnpkg.com/@types/raf/-/raf-3.4.0.tgz#2b72cbd55405e071f1c4d29992638e022b20acc2"
+  resolved "https://registry.npmjs.org/@types/raf/-/raf-3.4.0.tgz"
   integrity sha512-taW5/WYqo36N7V39oYyHP9Ipfd5pNFvGTIQsNGj86xV88YQ7GnI30/yMfKDF7Zgin0m3e+ikX88FvImnK4RjGw==
 
 "@types/range-parser@*":
   version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
+  resolved "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
 "@types/retry@0.12.0":
   version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d"
+  resolved "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz"
   integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
 
 "@types/semver@^7.3.12":
@@ -2015,14 +2337,14 @@
 
 "@types/serve-index@^1.9.1":
   version "1.9.1"
-  resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278"
+  resolved "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz"
   integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==
   dependencies:
     "@types/express" "*"
 
 "@types/serve-static@*", "@types/serve-static@^1.13.10":
   version "1.15.0"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.0.tgz#c7930ff61afb334e121a9da780aac0d9b8f34155"
+  resolved "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.0.tgz"
   integrity sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==
   dependencies:
     "@types/mime" "*"
@@ -2030,19 +2352,19 @@
 
 "@types/sockjs@^0.3.33":
   version "0.3.33"
-  resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f"
+  resolved "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz"
   integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==
   dependencies:
     "@types/node" "*"
 
 "@types/stack-utils@^2.0.0":
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c"
+  resolved "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz"
   integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==
 
 "@types/stacktrace-js@^0.0.33":
   version "0.0.33"
-  resolved "https://registry.yarnpkg.com/@types/stacktrace-js/-/stacktrace-js-0.0.33.tgz#9b027370ca161b89798f308af77438802546cb39"
+  resolved "https://registry.npmjs.org/@types/stacktrace-js/-/stacktrace-js-0.0.33.tgz"
   integrity sha512-aqJ6QM9QThNL4dHBhwl1f9B0oDqiREkYLn9RldghUKsGeFWWGlCsqsRWxbh+hDvvmptMFqc4aIfFIGz9BBu8Qg==
 
 "@types/strip-bom@^3.0.0":
@@ -2057,45 +2379,48 @@
 
 "@types/testing-library__jest-dom@^5.9.1":
   version "5.14.5"
-  resolved "https://registry.yarnpkg.com/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.5.tgz#d113709c90b3c75fdb127ec338dad7d5f86c974f"
+  resolved "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.5.tgz"
   integrity sha512-SBwbxYoyPIvxHbeHxTZX2Pe/74F/tX2/D3mMvzabdeJ25bBojfW0TyB8BHrbq/9zaaKICJZjLP+8r6AeZMFCuQ==
   dependencies:
     "@types/jest" "*"
 
+"@types/tough-cookie@*":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397"
+  integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
+
+"@types/web-bluetooth@^0.0.16":
+  version "0.0.16"
+  resolved "https://registry.yarnpkg.com/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz#1d12873a8e49567371f2a75fe3e7f7edca6662d8"
+  integrity sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==
+
 "@types/ws@^8.5.1":
   version "8.5.3"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.3.tgz#7d25a1ffbecd3c4f2d35068d0b283c037003274d"
+  resolved "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz"
   integrity sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==
   dependencies:
     "@types/node" "*"
 
 "@types/yargs-parser@*":
   version "21.0.0"
-  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
+  resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"
   integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
 
-"@types/yargs@^16.0.0":
-  version "16.0.4"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-16.0.4.tgz#26aad98dd2c2a38e421086ea9ad42b9e51642977"
-  integrity sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==
-  dependencies:
-    "@types/yargs-parser" "*"
-
 "@types/yargs@^17.0.8":
   version "17.0.11"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.11.tgz#5e10ca33e219807c0eee0f08b5efcba9b6a42c06"
+  resolved "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.11.tgz"
   integrity sha512-aB4y9UDUXTSMxmM4MH+YnuR0g5Cph3FLQBoWoMB21DSvFVAxRVEHEMx3TLh+zUZYMCQtKiqazz0Q4Rre31f/OA==
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@^5.43.0":
-  version "5.43.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.43.0.tgz#4a5248eb31b454715ddfbf8cfbf497529a0a78bc"
-  integrity sha512-wNPzG+eDR6+hhW4yobEmpR36jrqqQv1vxBq5LJO3fBAktjkvekfr4BRl+3Fn1CM/A+s8/EiGUbOMDoYqWdbtXA==
+"@typescript-eslint/eslint-plugin@^5.45.1":
+  version "5.46.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.46.1.tgz#098abb4c9354e19f460d57ab18bff1f676a6cff0"
+  integrity sha512-YpzNv3aayRBwjs4J3oz65eVLXc9xx0PDbIRisHj+dYhvBn02MjYOD96P8YGiWEIFBrojaUjxvkaUpakD82phsA==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.43.0"
-    "@typescript-eslint/type-utils" "5.43.0"
-    "@typescript-eslint/utils" "5.43.0"
+    "@typescript-eslint/scope-manager" "5.46.1"
+    "@typescript-eslint/type-utils" "5.46.1"
+    "@typescript-eslint/utils" "5.46.1"
     debug "^4.3.4"
     ignore "^5.2.0"
     natural-compare-lite "^1.4.0"
@@ -2103,77 +2428,77 @@
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/parser@^5.43.0":
-  version "5.43.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.43.0.tgz#9c86581234b88f2ba406f0b99a274a91c11630fd"
-  integrity sha512-2iHUK2Lh7PwNUlhFxxLI2haSDNyXvebBO9izhjhMoDC+S3XI9qt2DGFUsiJ89m2k7gGYch2aEpYqV5F/+nwZug==
+"@typescript-eslint/parser@^5.45.1":
+  version "5.46.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.46.1.tgz#1fc8e7102c1141eb64276c3b89d70da8c0ba5699"
+  integrity sha512-RelQ5cGypPh4ySAtfIMBzBGyrNerQcmfA1oJvPj5f+H4jI59rl9xxpn4bonC0tQvUKOEN7eGBFWxFLK3Xepneg==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.43.0"
-    "@typescript-eslint/types" "5.43.0"
-    "@typescript-eslint/typescript-estree" "5.43.0"
+    "@typescript-eslint/scope-manager" "5.46.1"
+    "@typescript-eslint/types" "5.46.1"
+    "@typescript-eslint/typescript-estree" "5.46.1"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.43.0":
-  version "5.43.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.43.0.tgz#566e46303392014d5d163704724872e1f2dd3c15"
-  integrity sha512-XNWnGaqAtTJsUiZaoiGIrdJYHsUOd3BZ3Qj5zKp9w6km6HsrjPk/TGZv0qMTWyWj0+1QOqpHQ2gZOLXaGA9Ekw==
+"@typescript-eslint/scope-manager@5.46.1":
+  version "5.46.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.46.1.tgz#70af8425c79bbc1178b5a63fb51102ddf48e104a"
+  integrity sha512-iOChVivo4jpwUdrJZyXSMrEIM/PvsbbDOX1y3UCKjSgWn+W89skxWaYXACQfxmIGhPVpRWK/VWPYc+bad6smIA==
   dependencies:
-    "@typescript-eslint/types" "5.43.0"
-    "@typescript-eslint/visitor-keys" "5.43.0"
+    "@typescript-eslint/types" "5.46.1"
+    "@typescript-eslint/visitor-keys" "5.46.1"
 
-"@typescript-eslint/type-utils@5.43.0":
-  version "5.43.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.43.0.tgz#91110fb827df5161209ecca06f70d19a96030be6"
-  integrity sha512-K21f+KY2/VvYggLf5Pk4tgBOPs2otTaIHy2zjclo7UZGLyFH86VfUOm5iq+OtDtxq/Zwu2I3ujDBykVW4Xtmtg==
+"@typescript-eslint/type-utils@5.46.1":
+  version "5.46.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.46.1.tgz#195033e4b30b51b870dfcf2828e88d57b04a11cc"
+  integrity sha512-V/zMyfI+jDmL1ADxfDxjZ0EMbtiVqj8LUGPAGyBkXXStWmCUErMpW873zEHsyguWCuq2iN4BrlWUkmuVj84yng==
   dependencies:
-    "@typescript-eslint/typescript-estree" "5.43.0"
-    "@typescript-eslint/utils" "5.43.0"
+    "@typescript-eslint/typescript-estree" "5.46.1"
+    "@typescript-eslint/utils" "5.46.1"
     debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.43.0":
-  version "5.43.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.43.0.tgz#e4ddd7846fcbc074325293515fa98e844d8d2578"
-  integrity sha512-jpsbcD0x6AUvV7tyOlyvon0aUsQpF8W+7TpJntfCUWU1qaIKu2K34pMwQKSzQH8ORgUrGYY6pVIh1Pi8TNeteg==
+"@typescript-eslint/types@5.46.1":
+  version "5.46.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.46.1.tgz#4e9db2107b9a88441c4d5ecacde3bb7a5ebbd47e"
+  integrity sha512-Z5pvlCaZgU+93ryiYUwGwLl9AQVB/PQ1TsJ9NZ/gHzZjN7g9IAn6RSDkpCV8hqTwAiaj6fmCcKSQeBPlIpW28w==
 
-"@typescript-eslint/typescript-estree@5.43.0":
-  version "5.43.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.43.0.tgz#b6883e58ba236a602c334be116bfc00b58b3b9f2"
-  integrity sha512-BZ1WVe+QQ+igWal2tDbNg1j2HWUkAa+CVqdU79L4HP9izQY6CNhXfkNwd1SS4+sSZAP/EthI1uiCSY/+H0pROg==
+"@typescript-eslint/typescript-estree@5.46.1":
+  version "5.46.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.46.1.tgz#5358088f98a8f9939355e0996f9c8f41c25eced2"
+  integrity sha512-j9W4t67QiNp90kh5Nbr1w92wzt+toiIsaVPnEblB2Ih2U9fqBTyqV9T3pYWZBRt6QoMh/zVWP59EpuCjc4VRBg==
   dependencies:
-    "@typescript-eslint/types" "5.43.0"
-    "@typescript-eslint/visitor-keys" "5.43.0"
+    "@typescript-eslint/types" "5.46.1"
+    "@typescript-eslint/visitor-keys" "5.46.1"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
     semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.43.0":
-  version "5.43.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.43.0.tgz#00fdeea07811dbdf68774a6f6eacfee17fcc669f"
-  integrity sha512-8nVpA6yX0sCjf7v/NDfeaOlyaIIqL7OaIGOWSPFqUKK59Gnumd3Wa+2l8oAaYO2lk0sO+SbWFWRSvhu8gLGv4A==
+"@typescript-eslint/utils@5.46.1":
+  version "5.46.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.46.1.tgz#7da3c934d9fd0eb4002a6bb3429f33298b469b4a"
+  integrity sha512-RBdBAGv3oEpFojaCYT4Ghn4775pdjvwfDOfQ2P6qzNVgQOVrnSPe5/Pb88kv7xzYQjoio0eKHKB9GJ16ieSxvA==
   dependencies:
     "@types/json-schema" "^7.0.9"
     "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.43.0"
-    "@typescript-eslint/types" "5.43.0"
-    "@typescript-eslint/typescript-estree" "5.43.0"
+    "@typescript-eslint/scope-manager" "5.46.1"
+    "@typescript-eslint/types" "5.46.1"
+    "@typescript-eslint/typescript-estree" "5.46.1"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
     semver "^7.3.7"
 
-"@typescript-eslint/visitor-keys@5.43.0":
-  version "5.43.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.43.0.tgz#cbbdadfdfea385310a20a962afda728ea106befa"
-  integrity sha512-icl1jNH/d18OVHLfcwdL3bWUKsBeIiKYTGxMJCoGe7xFht+E4QgzOqoWYrU8XSLJWhVw8nTacbm03v23J/hFTg==
+"@typescript-eslint/visitor-keys@5.46.1":
+  version "5.46.1"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.46.1.tgz#126cc6fe3c0f83608b2b125c5d9daced61394242"
+  integrity sha512-jczZ9noovXwy59KjRTk1OftT78pwygdcmCuBf8yMoWt/8O8l+6x2LSEze0E4TeepXK4MezW3zGSyoDRZK7Y9cg==
   dependencies:
-    "@typescript-eslint/types" "5.43.0"
+    "@typescript-eslint/types" "5.46.1"
     eslint-visitor-keys "^3.3.0"
 
 "@vue/compiler-sfc@2.7.8":
   version "2.7.8"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.8.tgz#731aadd6beafdb9c72fd8614ce189ac6cee87612"
+  resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.8.tgz"
   integrity sha512-2DK4YWKfgLnW9VDR9gnju1gcYRk3flKj8UNsms7fsRmFcg35slVTZEkqwBtX+wJBXaamFfn6NxSsZh3h12Ix/Q==
   dependencies:
     "@babel/parser" "^7.18.4"
@@ -2182,7 +2507,7 @@
 
 "@vue/component-compiler-utils@^3.1.0":
   version "3.3.0"
-  resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz#f9f5fb53464b0c37b2c8d2f3fbfe44df60f61dc9"
+  resolved "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz"
   integrity sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==
   dependencies:
     consolidate "^0.15.1"
@@ -2196,15 +2521,15 @@
   optionalDependencies:
     prettier "^1.18.2 || ^2.0.0"
 
-"@vue/devtools-api@^6.4.4":
-  version "6.4.4"
-  resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.4.4.tgz#0b024fc8ca91bb4b6035abaf53c5aecc17119b3b"
-  integrity sha512-Ku31WzpOV/8cruFaXaEZKF81WkNnvCSlBY4eOGtz5WMSdJvX1v1WWlSMGZeqUwPtQ27ZZz7B62erEMq8JDjcXw==
+"@vue/devtools-api@^6.4.5":
+  version "6.4.5"
+  resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.4.5.tgz#d54e844c1adbb1e677c81c665ecef1a2b4bb8380"
+  integrity sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==
 
-"@vue/test-utils@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.3.0.tgz#d563decdcd9c68a7bca151d4179a2bfd6d5c3e15"
-  integrity sha512-Xk2Xiyj2k5dFb8eYUKkcN9PzqZSppTlx7LaQWBbdA8tqh3jHr/KHX2/YLhNFc/xwDrgeLybqd+4ZCPJSGPIqeA==
+"@vue/test-utils@^1.3.3":
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.3.3.tgz#4fbd38587b0ec091dfaa355ac38ce3d888273285"
+  integrity sha512-DmZkKrH5/MSkrU0hhHhv5+aOXcEJSaOhutKMOh2viuiLiMaFeOLPiTEvtegLunO3rXBagzHO681qW1sNMaB1sQ==
   dependencies:
     dom-event-types "^1.0.0"
     lodash "^4.17.15"
@@ -2215,10 +2540,10 @@
   resolved "https://registry.yarnpkg.com/@vue/tsconfig/-/tsconfig-0.1.3.tgz#4a61dbd29783d01ddab504276dcf0c2b6988654f"
   integrity sha512-kQVsh8yyWPvHpb8gIc9l/HIDiiVUy1amynLNpCy8p+FoCiZXCo6fQos5/097MmnNZc9AtseDsCrfkhqCrJ8Olg==
 
-"@vue/vue2-jest@^29.1.0":
-  version "29.1.0"
-  resolved "https://registry.yarnpkg.com/@vue/vue2-jest/-/vue2-jest-29.1.0.tgz#5d4503a3481f61e226a9e136940d9727e68255c6"
-  integrity sha512-EtD/cwADEewo8PAtm/myKJgYafyFfmdBqxUH8ksPqlwGdJ3wHSr2Dp0pRQXqN5iUIsatiGSjimUJwRdSk8hgKg==
+"@vue/vue2-jest@^29.2.1":
+  version "29.2.2"
+  resolved "https://registry.yarnpkg.com/@vue/vue2-jest/-/vue2-jest-29.2.2.tgz#12c1711f7e61e3c91ac8817138b6a1ce0083e076"
+  integrity sha512-C/b8+vuwUlFIeOsxe7uaw4LdH5w/V1jrxrwNaTEWqeOUT/fFUyyhwewUHsBGWjCFWJYX45xpla081qmS9Nb2jQ==
   dependencies:
     "@babel/plugin-transform-modules-commonjs" "^7.2.0"
     "@vue/component-compiler-utils" "^3.1.0"
@@ -2227,9 +2552,31 @@
     source-map "0.5.6"
     tsconfig "^7.0.0"
 
+"@vueuse/core@^9.10.0":
+  version "9.10.0"
+  resolved "https://registry.yarnpkg.com/@vueuse/core/-/core-9.10.0.tgz#2ef6e55ca773c5b2db1e3f13b8292af96dd32214"
+  integrity sha512-CxMewME07qeuzuT/AOIQGv0EhhDoojniqU6pC3F8m5VC76L47UT18DcX88kWlP3I7d3qMJ4u/PD8iSRsy3bmNA==
+  dependencies:
+    "@types/web-bluetooth" "^0.0.16"
+    "@vueuse/metadata" "9.10.0"
+    "@vueuse/shared" "9.10.0"
+    vue-demi "*"
+
+"@vueuse/metadata@9.10.0":
+  version "9.10.0"
+  resolved "https://registry.yarnpkg.com/@vueuse/metadata/-/metadata-9.10.0.tgz#1a5eb94ca755bd8e666505f47da7d88969cffdc7"
+  integrity sha512-G5VZhgTCapzU9rv0Iq2HBrVOSGzOKb+OE668NxhXNcTjUjwYxULkEhAw70FtRLMZc+hxcFAzDZlKYA0xcwNMuw==
+
+"@vueuse/shared@9.10.0":
+  version "9.10.0"
+  resolved "https://registry.yarnpkg.com/@vueuse/shared/-/shared-9.10.0.tgz#49874a0f9955d28689b3133de660367c63dbc030"
+  integrity sha512-vakHJ2ZRklAzqmcVBL38RS7BxdBA4+5poG9NsSyqJxrt9kz0zX3P5CXMy0Hm6LFbZXUgvKdqAS3pUH1zX/5qTQ==
+  dependencies:
+    vue-demi "*"
+
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
+  resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz"
   integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
   dependencies:
     "@webassemblyjs/helper-numbers" "1.11.1"
@@ -2237,22 +2584,22 @@
 
 "@webassemblyjs/floating-point-hex-parser@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
+  resolved "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz"
   integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
 
 "@webassemblyjs/helper-api-error@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz"
   integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
 
 "@webassemblyjs/helper-buffer@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz"
   integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
 
 "@webassemblyjs/helper-numbers@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz"
   integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
   dependencies:
     "@webassemblyjs/floating-point-hex-parser" "1.11.1"
@@ -2261,12 +2608,12 @@
 
 "@webassemblyjs/helper-wasm-bytecode@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz"
   integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
 
 "@webassemblyjs/helper-wasm-section@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz"
   integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
   dependencies:
     "@webassemblyjs/ast" "1.11.1"
@@ -2276,26 +2623,26 @@
 
 "@webassemblyjs/ieee754@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
+  resolved "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz"
   integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
 "@webassemblyjs/leb128@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
+  resolved "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz"
   integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
   dependencies:
     "@xtuc/long" "4.2.2"
 
 "@webassemblyjs/utf8@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
+  resolved "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz"
   integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
 
 "@webassemblyjs/wasm-edit@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz"
   integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
   dependencies:
     "@webassemblyjs/ast" "1.11.1"
@@ -2309,7 +2656,7 @@
 
 "@webassemblyjs/wasm-gen@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz"
   integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
   dependencies:
     "@webassemblyjs/ast" "1.11.1"
@@ -2320,7 +2667,7 @@
 
 "@webassemblyjs/wasm-opt@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz"
   integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
   dependencies:
     "@webassemblyjs/ast" "1.11.1"
@@ -2330,7 +2677,7 @@
 
 "@webassemblyjs/wasm-parser@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz"
   integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
   dependencies:
     "@webassemblyjs/ast" "1.11.1"
@@ -2342,7 +2689,7 @@
 
 "@webassemblyjs/wast-printer@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz"
   integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
   dependencies:
     "@webassemblyjs/ast" "1.11.1"
@@ -2350,92 +2697,92 @@
 
 "@webpack-cli/configtest@^1.2.0":
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5"
+  resolved "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz"
   integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==
 
 "@webpack-cli/info@^1.5.0":
   version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1"
+  resolved "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz"
   integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==
   dependencies:
     envinfo "^7.7.3"
 
 "@webpack-cli/serve@^1.7.0":
   version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1"
+  resolved "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz"
   integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  resolved "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"
   integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
 "@xtuc/long@4.2.2":
   version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
-abab@^2.0.3, abab@^2.0.5:
+abab@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
   integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
 abbrev@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
 accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
   version "1.3.8"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
+  resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"
   integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
   dependencies:
     mime-types "~2.1.34"
     negotiator "0.6.3"
 
-acorn-globals@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
-  integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
+acorn-globals@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-7.0.1.tgz#0dbf05c44fa7c94332914c02066d5beff62c40c3"
+  integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==
   dependencies:
-    acorn "^7.1.1"
-    acorn-walk "^7.1.1"
+    acorn "^8.1.0"
+    acorn-walk "^8.0.2"
 
 acorn-import-assertions@^1.7.6:
   version "1.8.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
+  resolved "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz"
   integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-walk@^7.1.1:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
-  integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
+acorn-walk@^8.0.2:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
+  integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
-acorn@^7.1.1:
-  version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
-  integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
+acorn@^8.1.0, acorn@^8.8.1:
+  version "8.8.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
+  integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
 
-acorn@^8.2.4, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0:
+acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0:
   version "8.8.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.0.tgz#88c0187620435c7f6015803f5539dae05a9dbea8"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz"
   integrity sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==
 
 agent-base@6:
   version "6.0.2"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
   dependencies:
     debug "4"
 
 aggregate-error@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"
   integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
   dependencies:
     clean-stack "^2.0.0"
@@ -2443,26 +2790,26 @@ aggregate-error@^3.0.0:
 
 ajv-formats@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
+  resolved "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz"
   integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
   dependencies:
     ajv "^8.0.0"
 
 ajv-keywords@^3.5.2:
   version "3.5.2"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
 ajv-keywords@^5.0.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
+  resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz"
   integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
   dependencies:
     fast-deep-equal "^3.1.3"
 
 ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
   dependencies:
     fast-deep-equal "^3.1.1"
@@ -2472,7 +2819,7 @@ ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5:
 
 ajv@^8.0.0, ajv@^8.8.0:
   version "8.11.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
+  resolved "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz"
   integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
   dependencies:
     fast-deep-equal "^3.1.1"
@@ -2482,7 +2829,7 @@ ajv@^8.0.0, ajv@^8.8.0:
 
 amdi18n-loader@^0.9.3:
   version "0.9.3"
-  resolved "https://registry.yarnpkg.com/amdi18n-loader/-/amdi18n-loader-0.9.3.tgz#03a829cbe72a787a2ce54904c9be2a31474334b6"
+  resolved "https://registry.npmjs.org/amdi18n-loader/-/amdi18n-loader-0.9.3.tgz"
   integrity sha512-lFjLTgUn0aca6082T534dbvSojZuVe1Y3m+XAA1Z64fU8y0IBNj0Tk1uHJ6o59CuQDYsAV7Bk8wwL+54uJ4CHw==
   dependencies:
     coffee-loader "^0.7.2"
@@ -2490,7 +2837,7 @@ amdi18n-loader@^0.9.3:
 
 ansi-colors@^1.0.1:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
+  resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz"
   integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
   dependencies:
     ansi-wrap "^0.1.0"
@@ -2502,60 +2849,60 @@ ansi-colors@^4.1.3:
 
 ansi-escapes@^4.2.1:
   version "4.3.2"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
   dependencies:
     type-fest "^0.21.3"
 
 ansi-gray@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
+  resolved "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz"
   integrity sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==
   dependencies:
     ansi-wrap "0.1.0"
 
 ansi-html-community@^0.0.8:
   version "0.0.8"
-  resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
+  resolved "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz"
   integrity sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==
 
 ansi-regex@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
   integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
 
 ansi-regex@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
 ansi-styles@^3.2.1:
   version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
 ansi-styles@^5.0.0:
   version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-5.2.0.tgz#07449690ad45777d1924ac2abb2fc8895dba836b"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz"
   integrity sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==
 
 ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
+  resolved "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"
   integrity sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==
 
 anymatch@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
+  resolved "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"
   integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
   dependencies:
     micromatch "^3.1.4"
@@ -2563,7 +2910,7 @@ anymatch@^2.0.0:
 
 anymatch@^3.0.3, anymatch@~3.1.2:
   version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz"
   integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
   dependencies:
     normalize-path "^3.0.0"
@@ -2571,26 +2918,26 @@ anymatch@^3.0.3, anymatch@~3.1.2:
 
 append-buffer@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/append-buffer/-/append-buffer-1.0.2.tgz#d8220cf466081525efea50614f3de6514dfa58f1"
+  resolved "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz"
   integrity sha512-WLbYiXzD3y/ATLZFufV/rZvWdZOs+Z/+5v1rBZ463Jn398pa6kcde27cvozYnBoxXblGZTFfoPpsaEw0orU5BA==
   dependencies:
     buffer-equal "^1.0.0"
 
 archy@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
+  resolved "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
   integrity sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==
 
 argparse@^1.0.7:
   version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 argparse@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
 aria-query@>=5.0.0:
@@ -2602,56 +2949,56 @@ aria-query@>=5.0.0:
 
 aria-query@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.0.0.tgz#210c21aaf469613ee8c9a62c7f86525e058db52c"
+  resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.0.0.tgz"
   integrity sha512-V+SM7AbUwJ+EBnB8+DXs0hPZHO0W6pqBcc0dW90OwtVG02PswOu/teuARoLQjdDOH+t9pJgGnW5/Qmouf3gPJg==
 
 arr-diff@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  resolved "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"
   integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==
 
 arr-filter@^1.1.1:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/arr-filter/-/arr-filter-1.1.2.tgz#43fdddd091e8ef11aa4c45d9cdc18e2dff1711ee"
+  resolved "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz"
   integrity sha512-A2BETWCqhsecSvCkWAeVBFLH6sXEUGASuzkpjL3GR1SlL/PWL6M3J8EAAld2Uubmh39tvkJTqC9LeLHCUKmFXA==
   dependencies:
     make-iterator "^1.0.0"
 
 arr-flatten@^1.0.1, arr-flatten@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
+  resolved "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"
   integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
 arr-map@^2.0.0, arr-map@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/arr-map/-/arr-map-2.0.2.tgz#3a77345ffc1cf35e2a91825601f9e58f2e24cac4"
+  resolved "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz"
   integrity sha512-tVqVTHt+Q5Xb09qRkbu+DidW1yYzz5izWS2Xm2yFm7qJnmUfz4HPzNxbHkdRJbz2lrqI7S+z17xNYdFcBBO8Hw==
   dependencies:
     make-iterator "^1.0.0"
 
 arr-union@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  resolved "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"
   integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==
 
 array-each@^1.0.0, array-each@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
+  resolved "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"
   integrity sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==
 
 array-flatten@1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
   integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
 array-flatten@^2.1.2:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
+  resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
 array-initial@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/array-initial/-/array-initial-1.1.0.tgz#2fa74b26739371c3947bd7a7adc73be334b3d795"
+  resolved "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz"
   integrity sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw==
   dependencies:
     array-slice "^1.0.0"
@@ -2659,19 +3006,19 @@ array-initial@^1.0.0:
 
 array-last@^1.1.1:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/array-last/-/array-last-1.3.0.tgz#7aa77073fec565ddab2493f5f88185f404a9d336"
+  resolved "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz"
   integrity sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==
   dependencies:
     is-number "^4.0.0"
 
 array-slice@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
+  resolved "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"
   integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
 
 array-sort@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-sort/-/array-sort-1.0.0.tgz#e4c05356453f56f53512a7d1d6123f2c54c0a88a"
+  resolved "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz"
   integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==
   dependencies:
     default-compare "^1.0.0"
@@ -2680,17 +3027,17 @@ array-sort@^1.0.0:
 
 array-union@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
 array-unique@^0.3.2:
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  resolved "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"
   integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==
 
 assert@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32"
+  resolved "https://registry.npmjs.org/assert/-/assert-2.0.0.tgz"
   integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==
   dependencies:
     es6-object-assign "^1.1.0"
@@ -2700,19 +3047,19 @@ assert@^2.0.0:
 
 assign-symbols@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  resolved "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"
   integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==
 
 ast-metadata-inferer@^0.7.0:
   version "0.7.0"
-  resolved "https://registry.yarnpkg.com/ast-metadata-inferer/-/ast-metadata-inferer-0.7.0.tgz#c45d874cbdecabea26dc5de11fc6fa1919807c66"
+  resolved "https://registry.npmjs.org/ast-metadata-inferer/-/ast-metadata-inferer-0.7.0.tgz"
   integrity sha512-OkMLzd8xelb3gmnp6ToFvvsHLtS6CbagTkFQvQ+ZYFe3/AIl9iKikNR9G7pY3GfOR/2Xc222hwBjzI7HLkE76Q==
   dependencies:
     "@mdn/browser-compat-data" "^3.3.14"
 
 async-done@^1.2.0, async-done@^1.2.2:
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/async-done/-/async-done-1.3.2.tgz#5e15aa729962a4b07414f528a88cdf18e0b290a2"
+  resolved "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz"
   integrity sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==
   dependencies:
     end-of-stream "^1.1.0"
@@ -2722,24 +3069,24 @@ async-done@^1.2.0, async-done@^1.2.2:
 
 async-settle@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/async-settle/-/async-settle-1.0.0.tgz#1d0a914bb02575bec8a8f3a74e5080f72b2c0c6b"
+  resolved "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz"
   integrity sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==
   dependencies:
     async-done "^1.2.2"
 
 asynckit@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
+  resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
   integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
 atob@^2.1.2:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  resolved "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
 autoprefixer@10.4.5:
   version "10.4.5"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.5.tgz#662193c744094b53d3637f39be477e07bd904998"
+  resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.5.tgz"
   integrity sha512-Fvd8yCoA7lNX/OUllvS+aS1I7WRBclGXsepbvT8ZaPgrH24rgXpZzF0/6Hh3ZEkwg+0AES/Osd196VZmYoEFtw==
   dependencies:
     browserslist "^4.20.2"
@@ -2751,12 +3098,12 @@ autoprefixer@10.4.5:
 
 available-typed-arrays@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7"
+  resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"
   integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
 
 axios-mock-adapter@^1.20.0:
   version "1.21.2"
-  resolved "https://registry.yarnpkg.com/axios-mock-adapter/-/axios-mock-adapter-1.21.2.tgz#87a48f80aa89bb1ab1ad630fa467975e30aa4721"
+  resolved "https://registry.npmjs.org/axios-mock-adapter/-/axios-mock-adapter-1.21.2.tgz"
   integrity sha512-jzyNxU3JzB2XVhplZboUcF0YDs7xuExzoRSHXPHr+UQajaGmcTqvkkUADgkVI2WkGlpZ1zZlMVdcTMU0ejV8zQ==
   dependencies:
     fast-deep-equal "^3.1.3"
@@ -2764,63 +3111,34 @@ axios-mock-adapter@^1.20.0:
 
 axios@^0.25.0:
   version "0.25.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.25.0.tgz#349cfbb31331a9b4453190791760a8d35b093e0a"
+  resolved "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz"
   integrity sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==
   dependencies:
     follow-redirects "^1.14.7"
 
-babel-core@^7.0.0-bridge.0:
-  version "7.0.0-bridge.0"
-  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
-  integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==
-
-babel-jest@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-27.5.1.tgz#a1bf8d61928edfefd21da27eb86a695bfd691444"
-  integrity sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==
+babel-jest@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-29.3.1.tgz#05c83e0d128cd48c453eea851482a38782249f44"
+  integrity sha512-aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA==
   dependencies:
-    "@jest/transform" "^27.5.1"
-    "@jest/types" "^27.5.1"
+    "@jest/transform" "^29.3.1"
     "@types/babel__core" "^7.1.14"
     babel-plugin-istanbul "^6.1.1"
-    babel-preset-jest "^27.5.1"
+    babel-preset-jest "^29.2.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
     slash "^3.0.0"
 
-babel-jest@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-28.1.3.tgz#c1187258197c099072156a0a121c11ee1e3917d5"
-  integrity sha512-epUaPOEWMk3cWX0M/sPvCHHCe9fMFAa/9hXEgKP8nFfNl/jlGkE9ucq9NqkZGXLDduCJYS0UvSlPUwC0S+rH6Q==
-  dependencies:
-    "@jest/transform" "^28.1.3"
-    "@types/babel__core" "^7.1.14"
-    babel-plugin-istanbul "^6.1.1"
-    babel-preset-jest "^28.1.3"
-    chalk "^4.0.0"
-    graceful-fs "^4.2.9"
-    slash "^3.0.0"
-
-babel-loader@^8.2.5:
-  version "8.2.5"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.5.tgz#d45f585e654d5a5d90f5350a779d7647c5ed512e"
-  integrity sha512-OSiFfH89LrEMiWd4pLNqGz4CwJDtbs2ZVc+iGu2HrkRfPxId9F2anQj38IxWpmRfsUY0aBZYi1EFcd3mhtRMLQ==
-  dependencies:
-    find-cache-dir "^3.3.1"
-    loader-utils "^2.0.0"
-    make-dir "^3.1.0"
-    schema-utils "^2.6.5"
-
 babel-plugin-dynamic-import-node@^2.3.3:
   version "2.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
+  resolved "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"
   integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
   dependencies:
     object.assign "^4.1.0"
 
 babel-plugin-istanbul@^6.1.1:
   version "6.1.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
+  resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz"
   integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -2829,66 +3147,43 @@ babel-plugin-istanbul@^6.1.1:
     istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.1.tgz#9be98ecf28c331eb9f5df9c72d6f89deb8181c2e"
-  integrity sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==
-  dependencies:
-    "@babel/template" "^7.3.3"
-    "@babel/types" "^7.3.3"
-    "@types/babel__core" "^7.0.0"
-    "@types/babel__traverse" "^7.0.6"
-
-babel-plugin-jest-hoist@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-28.1.3.tgz#1952c4d0ea50f2d6d794353762278d1d8cca3fbe"
-  integrity sha512-Ys3tUKAmfnkRUpPdpa98eYrAR0nV+sSFUZZEGuQ2EbFd1y4SOLtD5QDNHAq+bb9a+bbXvYQC4b+ID/THIMcU6Q==
+babel-plugin-jest-hoist@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.2.0.tgz#23ee99c37390a98cfddf3ef4a78674180d823094"
+  integrity sha512-TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
     "@types/babel__core" "^7.1.14"
     "@types/babel__traverse" "^7.0.6"
 
-babel-plugin-polyfill-corejs2@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.2.tgz#e4c31d4c89b56f3cf85b92558954c66b54bd972d"
-  integrity sha512-LPnodUl3lS0/4wN3Rb+m+UK8s7lj2jcLRrjho4gLw+OJs+I4bvGXshINesY5xx/apM+biTnQ9reDI8yj+0M5+Q==
+babel-plugin-polyfill-corejs2@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
+  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
   dependencies:
     "@babel/compat-data" "^7.17.7"
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.3.tgz#d7e09c9a899079d71a8b670c6181af56ec19c5c7"
-  integrity sha512-zKsXDh0XjnrUEW0mxIHLfjBfnXSMr5Q/goMe/fxpQnLm07mcOZiIZHBNWCMx60HmdvjxfXcalac0tfFg0wqxyw==
+babel-plugin-polyfill-corejs3@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
+  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
-    core-js-compat "^3.21.0"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    core-js-compat "^3.25.1"
 
-babel-plugin-polyfill-regenerator@^0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.0.tgz#8f51809b6d5883e07e71548d75966ff7635527fe"
-  integrity sha512-RW1cnryiADFeHmfLS+WW/G431p1PsW5qdRdz0SDRi7TKcUgc7Oh/uXkT7MZ/+tGsT1BkczEAmD5XjUyJ5SWDTw==
+babel-plugin-polyfill-regenerator@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
+  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.2"
-
-babel-plugin-transform-inline-environment-variables@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-environment-variables/-/babel-plugin-transform-inline-environment-variables-0.4.4.tgz#974245008b3cbbd646bd81707af147aea3acca43"
-  integrity sha512-bJILBtn5a11SmtR2j/3mBOjX4K3weC6cq+NNZ7hG22wCAqpc3qtj/iN7dSe9HDiS46lgp1nHsQgeYrea/RUe+g==
-
-babel-plugin-transform-vue-template@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-vue-template/-/babel-plugin-transform-vue-template-0.4.2.tgz#7899dee289ba743644d7091e23db9f46695ce649"
-  integrity sha512-4rqM83oRbLnbFYMri5dMAqlJgLOBFw0begZ+5z0YimpKCEavuugtVSEN1jSB0IS0N9H1+umuK3hahbaAPp3deA==
-  dependencies:
-    "@babel/template" "^7.0.0-beta.46"
-    vue-template-es2015-compiler "^1.5.3"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
 
 babel-preset-current-node-syntax@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz#b4399239b89b2a011f9ddbe3e4f401fc40cff73b"
+  resolved "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz"
   integrity sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==
   dependencies:
     "@babel/plugin-syntax-async-generators" "^7.8.4"
@@ -2904,25 +3199,17 @@ babel-preset-current-node-syntax@^1.0.0:
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-top-level-await" "^7.8.3"
 
-babel-preset-jest@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-27.5.1.tgz#91f10f58034cb7989cb4f962b69fa6eef6a6bc81"
-  integrity sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==
+babel-preset-jest@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-29.2.0.tgz#3048bea3a1af222e3505e4a767a974c95a7620dc"
+  integrity sha512-z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA==
   dependencies:
-    babel-plugin-jest-hoist "^27.5.1"
-    babel-preset-current-node-syntax "^1.0.0"
-
-babel-preset-jest@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-28.1.3.tgz#5dfc20b99abed5db994406c2b9ab94c73aaa419d"
-  integrity sha512-L+fupJvlWAHbQfn74coNX3zf60LXMJsezNvvx8eIh7iOR1luJ1poxYgQk1F8PYtNq/6QODDHCqsSnTFSWC491A==
-  dependencies:
-    babel-plugin-jest-hoist "^28.1.3"
+    babel-plugin-jest-hoist "^29.2.0"
     babel-preset-current-node-syntax "^1.0.0"
 
 babel-runtime@^6.26.0:
   version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
+  resolved "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz"
   integrity sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==
   dependencies:
     core-js "^2.4.0"
@@ -2930,7 +3217,7 @@ babel-runtime@^6.26.0:
 
 bach@^1.0.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/bach/-/bach-1.2.0.tgz#4b3ce96bf27134f79a1b414a51c14e34c3bd9880"
+  resolved "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz"
   integrity sha512-bZOOfCb3gXBXbTFXq3OZtGR88LwGeJvzu6szttaIzymOTS4ZttBNOWSv7aLZja2EMycKtRYV0Oa8SNKH/zkxvg==
   dependencies:
     arr-filter "^1.1.1"
@@ -2945,34 +3232,34 @@ bach@^1.0.0:
 
 backbone@1.4.1:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/backbone/-/backbone-1.4.1.tgz#099a78184bc07b034048a8332229c2ccca1e3e62"
+  resolved "https://registry.npmjs.org/backbone/-/backbone-1.4.1.tgz"
   integrity sha512-ADy1ztN074YkWbHi8ojJVFe3vAanO/lrzMGZWUClIP7oDD/Pjy2vrASraUP+2EVCfIiTtCW4FChVow01XneivA==
   dependencies:
     underscore ">=1.8.3"
 
 balanced-match@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 base64-arraybuffer@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#1c37589a7c4b0746e34bd1feb951da2df01c1bdc"
+  resolved "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz"
   integrity sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==
 
 base64-js@^1.3.1:
   version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
 base64id@2.0.0, base64id@~2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
+  resolved "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz"
   integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
 
 base@^0.11.1:
   version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  resolved "https://registry.npmjs.org/base/-/base-0.11.2.tgz"
   integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
   dependencies:
     cache-base "^1.0.1"
@@ -2985,12 +3272,12 @@ base@^0.11.1:
 
 batch@0.6.1:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
+  resolved "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"
   integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==
 
 bent@~7.3.6:
   version "7.3.12"
-  resolved "https://registry.yarnpkg.com/bent/-/bent-7.3.12.tgz#e0a2775d4425e7674c64b78b242af4f49da6b035"
+  resolved "https://registry.npmjs.org/bent/-/bent-7.3.12.tgz"
   integrity sha512-T3yrKnVGB63zRuoco/7Ybl7BwwGZR0lceoVG5XmQyMIH9s19SV5m+a8qam4if0zQuAmOQTyPTPmsQBdAorGK3w==
   dependencies:
     bytesish "^0.4.1"
@@ -2999,22 +3286,27 @@ bent@~7.3.6:
 
 big.js@^5.2.2:
   version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  resolved "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
+bignumber.js@^8.1.1:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-8.1.1.tgz#4b072ae5aea9c20f6730e4e5d529df1271c4d885"
+  integrity sha512-QD46ppGintwPGuL1KqmwhR0O+N2cZUg8JG/VzwI2e28sM9TqHjQB10lI4QAaMHVbLzwVLLAwEglpKPViWX+5NQ==
+
 binary-extensions@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
 bluebird@^3.1.1:
   version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
 body-parser@1.20.0, body-parser@^1.19.0:
   version "1.20.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.0.tgz#3de69bd89011c11573d7bfee6a64f11b6bd27cc5"
+  resolved "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz"
   integrity sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==
   dependencies:
     bytes "3.1.2"
@@ -3032,7 +3324,7 @@ body-parser@1.20.0, body-parser@^1.19.0:
 
 bonjour-service@^1.0.11:
   version "1.0.13"
-  resolved "https://registry.yarnpkg.com/bonjour-service/-/bonjour-service-1.0.13.tgz#4ac003dc1626023252d58adf2946f57e5da450c1"
+  resolved "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.0.13.tgz"
   integrity sha512-LWKRU/7EqDUC9CTAQtuZl5HzBALoCYwtLhffW3et7vZMwv3bWLpJf8bRYlMD5OCcDpTfnPgNCV4yo9ZIaJGMiA==
   dependencies:
     array-flatten "^2.1.2"
@@ -3042,13 +3334,13 @@ bonjour-service@^1.0.11:
 
 boolbase@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
+  resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
   integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
 bootstrap-vue@^2.23.0:
-  version "2.23.0"
-  resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.23.0.tgz#b1013392146852172e8076330169ea6aace2a130"
-  integrity sha512-cue/PixZ9p3SF7+x0necSE5jkwHWcBeDtUn8/MIWvqh0p5uxWjW3qIMep4cro6wte6ASJ7jGWhTaqHDtdMgHow==
+  version "2.23.1"
+  resolved "https://registry.yarnpkg.com/bootstrap-vue/-/bootstrap-vue-2.23.1.tgz#8f866f7cda27eb0e7e13a0bea8d55d8fc7a82199"
+  integrity sha512-SEWkG4LzmMuWjQdSYmAQk1G/oOKm37dtNfjB5kxq0YafnL2W6qUAmeDTcIZVbPiQd2OQlIkWOMPBRGySk/zGsg==
   dependencies:
     "@nuxt/opencollective" "^0.3.2"
     bootstrap "^4.6.1"
@@ -3058,12 +3350,12 @@ bootstrap-vue@^2.23.0:
 
 bootstrap@4.6, bootstrap@^4.6.1:
   version "4.6.2"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.6.2.tgz#8e0cd61611728a5bf65a3a2b8d6ff6c77d5d7479"
+  resolved "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz"
   integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
   integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
@@ -3071,14 +3363,14 @@ brace-expansion@^1.1.7:
 
 brace-expansion@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"
   integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
   dependencies:
     balanced-match "^1.0.0"
 
 braces@^2.3.1:
   version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  resolved "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"
   integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
     arr-flatten "^1.1.0"
@@ -3094,19 +3386,14 @@ braces@^2.3.1:
 
 braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
   dependencies:
     fill-range "^7.0.1"
 
-browser-process-hrtime@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
-  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
-
 browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.16.8, browserslist@^4.20.2, browserslist@^4.20.3, browserslist@^4.21.3:
   version "4.21.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.3.tgz#5df277694eb3c48bc5c4b05af3e8b7e09c5a6d1a"
+  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz"
   integrity sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==
   dependencies:
     caniuse-lite "^1.0.30001370"
@@ -3114,6 +3401,16 @@ browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4
     node-releases "^2.0.6"
     update-browserslist-db "^1.0.5"
 
+browserslist@^4.21.4:
+  version "4.21.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.4.tgz#e7496bbc67b9e39dd0f98565feccdcb0d4ff6987"
+  integrity sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==
+  dependencies:
+    caniuse-lite "^1.0.30001400"
+    electron-to-chromium "^1.4.251"
+    node-releases "^2.0.6"
+    update-browserslist-db "^1.0.9"
+
 bs-logger@0.x:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8"
@@ -3123,29 +3420,29 @@ bs-logger@0.x:
 
 bser@2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/bser/-/bser-2.1.1.tgz#e6787da20ece9d07998533cfd9de6f5c38f4bc05"
+  resolved "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz"
   integrity sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==
   dependencies:
     node-int64 "^0.4.0"
 
 btoa@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.2.1.tgz#01a9909f8b2c93f6bf680ba26131eb30f7fa3d73"
+  resolved "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz"
   integrity sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==
 
 buffer-equal@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.0.tgz#59616b498304d556abd466966b22eeda3eca5fbe"
+  resolved "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz"
   integrity sha512-tcBWO2Dl4e7Asr9hTGcpVrCe+F7DubpmqWCTbj4FHLmjqO2hIaC383acQubWtRJhdceqs5uBHs6Es+Sk//RKiQ==
 
 buffer-from@^1.0.0, buffer-from@^1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
 buffer@^5.7.1:
   version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
   dependencies:
     base64-js "^1.3.1"
@@ -3153,7 +3450,7 @@ buffer@^5.7.1:
 
 buffer@^6.0.3:
   version "6.0.3"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+  resolved "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz"
   integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
   dependencies:
     base64-js "^1.3.1"
@@ -3168,22 +3465,22 @@ busboy@^1.6.0:
 
 bytes@3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
+  resolved "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"
   integrity sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==
 
 bytes@3.1.2:
   version "3.1.2"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
+  resolved "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz"
   integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
 bytesish@^0.4.1:
   version "0.4.4"
-  resolved "https://registry.yarnpkg.com/bytesish/-/bytesish-0.4.4.tgz#f3b535a0f1153747427aee27256748cff92347e6"
+  resolved "https://registry.npmjs.org/bytesish/-/bytesish-0.4.4.tgz"
   integrity sha512-i4uu6M4zuMUiyfZN4RU2+i9+peJh//pXhd9x1oSe1LBkZ3LEbCoygu8W0bXTukU1Jme2txKuotpCZRaC3FLxcQ==
 
 cache-base@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  resolved "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"
   integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
   dependencies:
     collection-visit "^1.0.0"
@@ -3198,7 +3495,7 @@ cache-base@^1.0.1:
 
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
   integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
   dependencies:
     function-bind "^1.1.1"
@@ -3206,27 +3503,27 @@ call-bind@^1.0.0, call-bind@^1.0.2:
 
 callsites@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
 camelcase@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
+  resolved "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"
   integrity sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==
 
 camelcase@^5.3.1:
   version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
 camelcase@^6.2.0:
   version "6.3.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+  resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-api@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
+  resolved "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz"
   integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
   dependencies:
     browserslist "^4.0.0"
@@ -3236,12 +3533,17 @@ caniuse-api@^3.0.0:
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001304, caniuse-lite@^1.0.30001332, caniuse-lite@^1.0.30001370:
   version "1.0.30001375"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001375.tgz#8e73bc3d1a4c800beb39f3163bf0190d7e5d7672"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001375.tgz"
   integrity sha512-kWIMkNzLYxSvnjy0hL8w1NOaWNr2rn39RTAVyIwcw8juu60bZDWiF1/loOYANzjtJmy6qPgNmn38ro5Pygagdw==
 
+caniuse-lite@^1.0.30001400:
+  version "1.0.30001439"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001439.tgz#ab7371faeb4adff4b74dad1718a6fd122e45d9cb"
+  integrity sha512-1MgUzEkoMO6gKfXflStpYgZDlFM7M/ck/bgfVCACO5vnAf0fXoNVHdWtqGU+MYca+4bL9Z5bpOVmR33cWW9G2A==
+
 canvg@^3.0.6:
   version "3.0.10"
-  resolved "https://registry.yarnpkg.com/canvg/-/canvg-3.0.10.tgz#8e52a2d088b6ffa23ac78970b2a9eebfae0ef4b3"
+  resolved "https://registry.npmjs.org/canvg/-/canvg-3.0.10.tgz"
   integrity sha512-qwR2FRNO9NlzTeKIPIKpnTY6fqwuYSequ8Ru8c0YkYU7U0oW+hLUvWadLvAu1Rl72OMNiFhoLu4f8eUjQ7l/+Q==
   dependencies:
     "@babel/runtime" "^7.12.5"
@@ -3255,12 +3557,12 @@ canvg@^3.0.6:
 
 caseless@~0.12.0:
   version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
+  resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
 chalk@^2.0.0, chalk@^2.1.0:
   version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
     ansi-styles "^3.2.1"
@@ -3269,7 +3571,7 @@ chalk@^2.0.0, chalk@^2.1.0:
 
 chalk@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4"
+  resolved "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz"
   integrity sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==
   dependencies:
     ansi-styles "^4.1.0"
@@ -3277,7 +3579,7 @@ chalk@^3.0.0:
 
 chalk@^4.0.0, chalk@^4.1.0, chalk@~4.1.0:
   version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
   dependencies:
     ansi-styles "^4.1.0"
@@ -3285,7 +3587,7 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@~4.1.0:
 
 char-regex@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
+  resolved "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
 chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^2.0.0, chokidar@^3.5.1, chokidar@^3.5.3:
@@ -3305,22 +3607,22 @@ chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^2.0.0, chokidar@^3.5.1, cho
 
 chrome-trace-event@^1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
+  resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"
   integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
 ci-info@^3.2.0:
   version "3.3.2"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.2.tgz#6d2967ffa407466481c6c90b6e16b3098f080128"
+  resolved "https://registry.npmjs.org/ci-info/-/ci-info-3.3.2.tgz"
   integrity sha512-xmDt/QIAdeZ9+nfdPsaBCpMvHNLFiLdjj59qjqn+6iPe6YmHGQ35sBnQ8uslRBXFmXkiZQOJRjvQeoGppoTjjg==
 
 circular-json@^0.5.0:
   version "0.5.9"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
+  resolved "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz"
   integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
 
 citation-js@^0.6.4:
   version "0.6.4"
-  resolved "https://registry.yarnpkg.com/citation-js/-/citation-js-0.6.4.tgz#e0e1034a2121c15405535f8d43f9771341b4c39a"
+  resolved "https://registry.npmjs.org/citation-js/-/citation-js-0.6.4.tgz"
   integrity sha512-0PzLs7L7yf0NWCNDg7TEIZ0YoFkw62JRFzM5qciBR8WzaFiWyOKr3PksNJneNK+/ZqRliMbGdVNunOUiZ0iERQ==
   dependencies:
     "@citation-js/cli" "0.6.4"
@@ -3337,17 +3639,17 @@ citation-js@^0.6.4:
 
 citeproc@^2.4.59, citeproc@^2.4.6:
   version "2.4.62"
-  resolved "https://registry.yarnpkg.com/citeproc/-/citeproc-2.4.62.tgz#c2a27eafd7182b95b0812b92c53193b037840ed3"
+  resolved "https://registry.npmjs.org/citeproc/-/citeproc-2.4.62.tgz"
   integrity sha512-l3uFfSEwNZp/jlz/TpgyBs85kOww6VlQHbAth0cpbgOn6iulZd+QlFY43LrRelzcYt3FZHTZ3soDyd8lNmkqdw==
 
 cjs-module-lexer@^1.0.0:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40"
+  resolved "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz"
   integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==
 
 class-utils@^0.3.5:
   version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  resolved "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"
   integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
   dependencies:
     arr-union "^3.1.0"
@@ -3357,12 +3659,12 @@ class-utils@^0.3.5:
 
 clean-stack@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
 cliui@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
+  resolved "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"
   integrity sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==
   dependencies:
     string-width "^1.0.1"
@@ -3371,21 +3673,30 @@ cliui@^3.2.0:
 
 cliui@^7.0.2:
   version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  resolved "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"
   integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
   dependencies:
     string-width "^4.2.0"
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
+
 clone-buffer@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
+  resolved "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz"
   integrity sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==
 
 clone-deep@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+  resolved "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz"
   integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
   dependencies:
     is-plain-object "^2.0.4"
@@ -3394,17 +3705,17 @@ clone-deep@^4.0.1:
 
 clone-stats@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
+  resolved "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz"
   integrity sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==
 
 clone@^2.1.1:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  resolved "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"
   integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==
 
 cloneable-readable@^1.0.0:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
+  resolved "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz"
   integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
   dependencies:
     inherits "^2.0.1"
@@ -3413,34 +3724,34 @@ cloneable-readable@^1.0.0:
 
 co@^4.6.0:
   version "4.6.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
+  resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
 code-point-at@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
+  resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"
   integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
 
 coffee-loader@^0.7.2:
   version "0.7.3"
-  resolved "https://registry.yarnpkg.com/coffee-loader/-/coffee-loader-0.7.3.tgz#fadbc6efd6fc7ecc88c5b3046a2c292066bcb54a"
+  resolved "https://registry.npmjs.org/coffee-loader/-/coffee-loader-0.7.3.tgz"
   integrity sha512-YZlVCkhdf9RJbBq5x0nAIY2lEylIqCXjNhnwMcPVm0mCNhHoe5aZ2UVD0mAgdfJow0TQCBodoHnVfEbDsRXbyg==
   dependencies:
     loader-utils "^1.0.2"
 
 coffee-script@^1.12.2:
   version "1.12.7"
-  resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
+  resolved "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz"
   integrity sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==
 
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
+  resolved "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz"
   integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
 
 collection-map@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-map/-/collection-map-1.0.0.tgz#aea0f06f8d26c780c2b75494385544b2255af18c"
+  resolved "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz"
   integrity sha512-5D2XXSpkOnleOI21TG7p3T0bGAsZ/XknZpKBmGYyluO8pw4zA3K8ZlrBIbC4FXg3m6z/RNFiUFfT2sQK01+UHA==
   dependencies:
     arr-map "^2.0.2"
@@ -3449,7 +3760,7 @@ collection-map@^1.0.0:
 
 collection-visit@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  resolved "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"
   integrity sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==
   dependencies:
     map-visit "^1.0.0"
@@ -3457,46 +3768,46 @@ collection-visit@^1.0.0:
 
 color-convert@^1.9.0:
   version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-convert@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
   integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
   dependencies:
     color-name "~1.1.4"
 
 color-name@1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-name@~1.1.4:
   version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 color-support@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  resolved "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
 colord@^2.9.1:
   version "2.9.3"
-  resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
+  resolved "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz"
   integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
 
 colorette@^2.0.10, colorette@^2.0.14:
   version "2.0.19"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
+  resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz"
   integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
 
 combine-errors@^3.0.3:
   version "3.0.3"
-  resolved "https://registry.yarnpkg.com/combine-errors/-/combine-errors-3.0.3.tgz#f4df6740083e5703a3181110c2b10551f003da86"
+  resolved "https://registry.npmjs.org/combine-errors/-/combine-errors-3.0.3.tgz"
   integrity sha512-C8ikRNRMygCwaTx+Ek3Yr+OuZzgZjduCOfSQBjbM8V3MfgcjSTeto/GXP6PAwKvJz/v15b7GHZvx5rOlczFw/Q==
   dependencies:
     custom-error-instance "2.1.1"
@@ -3504,46 +3815,41 @@ combine-errors@^3.0.3:
 
 combined-stream@^1.0.8:
   version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@7.2.0, commander@^7.0.0, commander@^7.2.0:
+commander@7, commander@7.2.0, commander@^7.0.0, commander@^7.2.0:
   version "7.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
 commander@^2.19.0, commander@^2.20.0:
   version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
 commander@^9.2.0:
   version "9.4.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.0.tgz#bc4a40918fefe52e22450c111ecd6b7acce6f11c"
+  resolved "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz"
   integrity sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==
 
-commondir@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
-
 component-emitter@^1.2.1, component-emitter@~1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  resolved "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
 compressible@~2.0.16:
   version "2.0.18"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
+  resolved "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"
   integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
   dependencies:
     mime-db ">= 1.43.0 < 2"
 
 compression@^1.7.4:
   version "1.7.4"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  resolved "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"
   integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
   dependencies:
     accepts "~1.3.5"
@@ -3556,12 +3862,12 @@ compression@^1.7.4:
 
 concat-map@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 concat-stream@^1.6.0:
   version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
+  resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
   dependencies:
     buffer-from "^1.0.0"
@@ -3571,7 +3877,7 @@ concat-stream@^1.6.0:
 
 condense-newlines@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f"
+  resolved "https://registry.npmjs.org/condense-newlines/-/condense-newlines-0.2.1.tgz"
   integrity sha512-P7X+QL9Hb9B/c8HI5BFFKmjgBu2XpQuF98WZ9XkO+dBGgk5XgwiQz7o1SmpglNWId3581UcS0SFAWfoIhMHPfg==
   dependencies:
     extend-shallow "^2.0.1"
@@ -3580,7 +3886,7 @@ condense-newlines@^0.2.1:
 
 config-chain@^1.1.13:
   version "1.1.13"
-  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
+  resolved "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz"
   integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
   dependencies:
     ini "^1.3.4"
@@ -3588,12 +3894,12 @@ config-chain@^1.1.13:
 
 connect-history-api-fallback@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8"
+  resolved "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz"
   integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==
 
 connect@^3.7.0:
   version "3.7.0"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
+  resolved "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz"
   integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
   dependencies:
     debug "2.6.9"
@@ -3603,89 +3909,93 @@ connect@^3.7.0:
 
 consola@^2.15.0:
   version "2.15.3"
-  resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"
+  resolved "https://registry.npmjs.org/consola/-/consola-2.15.3.tgz"
   integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==
 
 consolidate@^0.15.1:
   version "0.15.1"
-  resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
+  resolved "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz"
   integrity sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==
   dependencies:
     bluebird "^3.1.1"
 
 content-disposition@0.5.4:
   version "0.5.4"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
+  resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"
   integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
   dependencies:
     safe-buffer "5.2.1"
 
 content-type@~1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
+  resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.5.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.8.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
+  resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"
   integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
   dependencies:
     safe-buffer "~5.1.1"
 
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
+
 cookie-signature@1.0.6:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
   integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
 cookie@0.5.0:
   version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
+  resolved "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz"
   integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
 cookie@~0.4.1:
   version "0.4.2"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
+  resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"
   integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
 
 copy-descriptor@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  resolved "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"
   integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
 
 copy-props@^2.0.1:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-2.0.5.tgz#03cf9ae328d4ebb36f8f1d804448a6af9ee3f2d2"
+  resolved "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz"
   integrity sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==
   dependencies:
     each-props "^1.3.2"
     is-plain-object "^5.0.0"
 
-core-js-compat@^3.21.0, core-js-compat@^3.22.1:
-  version "3.24.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.24.1.tgz#d1af84a17e18dfdd401ee39da9996f9a7ba887de"
-  integrity sha512-XhdNAGeRnTpp8xbD+sR/HFDK9CbeeeqXT6TuofXh3urqEevzkWmLRgrVoykodsw8okqo2pu1BOmuCKrHx63zdw==
+core-js-compat@^3.25.1:
+  version "3.26.1"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.26.1.tgz#0e710b09ebf689d719545ac36e49041850f943df"
+  integrity sha512-622/KzTudvXCDLRw70iHW4KKs1aGpcRcowGWyYJr2DEBfRrd6hNJybxSWJFuZYD4ma86xhrwDDHxmDaIq4EA8A==
   dependencies:
-    browserslist "^4.21.3"
-    semver "7.0.0"
+    browserslist "^4.21.4"
 
 core-js@^2.4.0:
   version "2.6.12"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz"
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-js@^3.16.2, core-js@^3.21.0, core-js@^3.6.0, core-js@^3.8.3:
   version "3.24.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.24.1.tgz#cf7724d41724154010a6576b7b57d94c5d66e64f"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-3.24.1.tgz"
   integrity sha512-0QTBSYSUZ6Gq21utGzkfITDylE8jWC9Ne1D2MrhvlsZBI1x39OdDIVbzSqtgMndIy6BlHxBXpMGqzZmnztg2rg==
 
 core-util-is@~1.0.0:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
 cors@~2.8.5:
   version "2.8.5"
-  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  resolved "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz"
   integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
   dependencies:
     object-assign "^4"
@@ -3693,7 +4003,7 @@ cors@~2.8.5:
 
 cosmiconfig@^7.0.0:
   version "7.0.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
+  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz"
   integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
   dependencies:
     "@types/parse-json" "^4.0.0"
@@ -3704,7 +4014,7 @@ cosmiconfig@^7.0.0:
 
 cross-spawn@^7.0.2, cross-spawn@^7.0.3:
   version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
   dependencies:
     path-key "^3.1.0"
@@ -3713,19 +4023,19 @@ cross-spawn@^7.0.2, cross-spawn@^7.0.3:
 
 css-declaration-sorter@^6.3.0:
   version "6.3.0"
-  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz#72ebd995c8f4532ff0036631f7365cce9759df14"
+  resolved "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.3.0.tgz"
   integrity sha512-OGT677UGHJTAVMRhPO+HJ4oKln3wkBTwtDFH0ojbqm+MJm6xuDMHp2nkhh/ThaBqq20IbraBQSWKfSLNHQO9Og==
 
 css-line-break@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-line-break/-/css-line-break-2.1.0.tgz#bfef660dfa6f5397ea54116bb3cb4873edbc4fa0"
+  resolved "https://registry.npmjs.org/css-line-break/-/css-line-break-2.1.0.tgz"
   integrity sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==
   dependencies:
     utrie "^1.0.2"
 
 css-loader@^6.7.1:
   version "6.7.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.7.1.tgz#e98106f154f6e1baf3fc3bc455cb9981c1d5fd2e"
+  resolved "https://registry.npmjs.org/css-loader/-/css-loader-6.7.1.tgz"
   integrity sha512-yB5CNFa14MbPJcomwNh3wLThtkZgcNyI2bNMRt8iE5Z8Vwl7f8vQXFAzn2HDOJvtDq2NTZBUGMSUNNyrv3/+cw==
   dependencies:
     icss-utils "^5.1.0"
@@ -3739,7 +4049,7 @@ css-loader@^6.7.1:
 
 css-minimizer-webpack-plugin@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-4.0.0.tgz#e11800388c19c2b7442c39cc78ac8ae3675c9605"
+  resolved "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-4.0.0.tgz"
   integrity sha512-7ZXXRzRHvofv3Uac5Y+RkWRNo0ZMlcg8e9/OtrqUYmwDWJo+qs67GvdeFrXLsFb7czKNwjQhPkM0avlIYl+1nA==
   dependencies:
     cssnano "^5.1.8"
@@ -3751,7 +4061,7 @@ css-minimizer-webpack-plugin@^4.0.0:
 
 css-select@^4.1.3:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
+  resolved "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz"
   integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==
   dependencies:
     boolbase "^1.0.0"
@@ -3762,7 +4072,7 @@ css-select@^4.1.3:
 
 css-tree@^1.1.2, css-tree@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
+  resolved "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz"
   integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==
   dependencies:
     mdn-data "2.0.14"
@@ -3778,22 +4088,22 @@ css-tree@^2.0.1:
 
 css-what@^6.0.1:
   version "6.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
+  resolved "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz"
   integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
 
 css.escape@^1.5.1:
   version "1.5.1"
-  resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
+  resolved "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz"
   integrity sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==
 
 cssesc@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
 cssnano-preset-default@^5.2.12:
   version "5.2.12"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.12.tgz#ebe6596ec7030e62c3eb2b3c09f533c0644a9a97"
+  resolved "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.12.tgz"
   integrity sha512-OyCBTZi+PXgylz9HAA5kHyoYhfGcYdwFmyaJzWnzxuGRtnMw/kR6ilW9XzlzlRAtB6PLT/r+prYgkef7hngFew==
   dependencies:
     css-declaration-sorter "^6.3.0"
@@ -3828,12 +4138,12 @@ cssnano-preset-default@^5.2.12:
 
 cssnano-utils@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861"
+  resolved "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz"
   integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==
 
 cssnano@^5.1.8:
   version "5.1.12"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.12.tgz#bcd0b64d6be8692de79332c501daa7ece969816c"
+  resolved "https://registry.npmjs.org/cssnano/-/cssnano-5.1.12.tgz"
   integrity sha512-TgvArbEZu0lk/dvg2ja+B7kYoD7BBCmn3+k58xD0qjrGHsFzXY/wKTo9M5egcUCabPol05e/PVoIu79s2JN4WQ==
   dependencies:
     cssnano-preset-default "^5.2.12"
@@ -3842,122 +4152,366 @@ cssnano@^5.1.8:
 
 csso@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
+  resolved "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz"
   integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
   dependencies:
     css-tree "^1.1.2"
 
-cssom@^0.4.4:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
-  integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
+cssom@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
+  integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==
 
 cssom@~0.3.6:
   version "0.3.8"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  resolved "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz"
   integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
 
 cssstyle@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
+  resolved "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz"
   integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
   dependencies:
     cssom "~0.3.6"
 
 csstype@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.0.tgz#4ddcac3718d787cf9df0d1b7d15033925c8f29f2"
+  resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz"
   integrity sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==
 
 csv-parse@^5.3.0:
   version "5.3.0"
-  resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.3.0.tgz#85cc02fc9d1c89bd1b02e69069c960f8b8064322"
+  resolved "https://registry.npmjs.org/csv-parse/-/csv-parse-5.3.0.tgz"
   integrity sha512-UXJCGwvJ2fep39purtAn27OUYmxB1JQto+zhZ4QlJpzsirtSFbzLvip1aIgziqNdZp/TptvsKEV5BZSxe10/DQ==
 
 custom-error-instance@2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/custom-error-instance/-/custom-error-instance-2.1.1.tgz#3cf6391487a6629a6247eb0ca0ce00081b7e361a"
+  resolved "https://registry.npmjs.org/custom-error-instance/-/custom-error-instance-2.1.1.tgz"
   integrity sha512-p6JFxJc3M4OTD2li2qaHkDCw9SfMw82Ldr6OC9Je1aXiGfhx2W8p3GaoeaGrPJTUN9NirTM/KTxHWMUdR1rsUg==
 
 custom-event@~1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
+  resolved "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz"
   integrity sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==
 
-d3@3:
-  version "3.5.17"
-  resolved "https://registry.yarnpkg.com/d3/-/d3-3.5.17.tgz#bc46748004378b21a360c9fc7cf5231790762fb8"
-  integrity sha512-yFk/2idb8OHPKkbAL8QaOaqENNoMhIaSHZerk3oQsECwkObkCpJyjYwCe+OHiq6UEdhe1m8ZGARRRO3ljFjlKg==
+"d3-array@2 - 3", "d3-array@2.10.0 - 3", "d3-array@2.5.0 - 3", d3-array@3, d3-array@^3.2.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-3.2.1.tgz#39331ea706f5709417d31bbb6ec152e0328b39b3"
+  integrity sha512-gUY/qeHq/yNqqoCKNq4vtpFLdoCdvyNpWoC/KNjhGbhDuQpAM9sIQQKkXSNpXa9h5KySs/gzm7R88WkUutgwWQ==
+  dependencies:
+    internmap "1 - 2"
+
+d3-axis@3:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-axis/-/d3-axis-3.0.0.tgz#c42a4a13e8131d637b745fc2973824cfeaf93322"
+  integrity sha512-IH5tgjV4jE/GhHkRV0HiVYPDtvfjHQlQfJHs0usq7M30XcSBvOotpmH1IgkcXsO/5gEQZD43B//fc7SRT5S+xw==
+
+d3-brush@3:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-brush/-/d3-brush-3.0.0.tgz#6f767c4ed8dcb79de7ede3e1c0f89e63ef64d31c"
+  integrity sha512-ALnjWlVYkXsVIGlOsuWH1+3udkYFI48Ljihfnh8FZPF2QS9o+PzGLBslO0PjzVoHLZ2KCVgAM8NVkXPJB2aNnQ==
+  dependencies:
+    d3-dispatch "1 - 3"
+    d3-drag "2 - 3"
+    d3-interpolate "1 - 3"
+    d3-selection "3"
+    d3-transition "3"
+
+d3-chord@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-chord/-/d3-chord-3.0.1.tgz#d156d61f485fce8327e6abf339cb41d8cbba6966"
+  integrity sha512-VE5S6TNa+j8msksl7HwjxMHDM2yNK3XCkusIlpX5kwauBfXuyLAtNg9jCp/iHH61tgI4sb6R/EIMWCqEIdjT/g==
+  dependencies:
+    d3-path "1 - 3"
+
+"d3-color@1 - 3", d3-color@3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/d3-color/-/d3-color-3.1.0.tgz#395b2833dfac71507f12ac2f7af23bf819de24e2"
+  integrity sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==
+
+d3-contour@4:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/d3-contour/-/d3-contour-4.0.0.tgz#5a1337c6da0d528479acdb5db54bc81a0ff2ec6b"
+  integrity sha512-7aQo0QHUTu/Ko3cP9YK9yUTxtoDEiDGwnBHyLxG5M4vqlBkO/uixMRele3nfsfj6UXOcuReVpVXzAboGraYIJw==
+  dependencies:
+    d3-array "^3.2.0"
+
+d3-delaunay@6:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/d3-delaunay/-/d3-delaunay-6.0.2.tgz#7fd3717ad0eade2fc9939f4260acfb503f984e92"
+  integrity sha512-IMLNldruDQScrcfT+MWnazhHbDJhcRJyOEBAJfwQnHle1RPh6WDuLvxNArUju2VSMSUuKlY5BGHRJ2cYyoFLQQ==
+  dependencies:
+    delaunator "5"
+
+"d3-dispatch@1 - 3", d3-dispatch@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-dispatch/-/d3-dispatch-3.0.1.tgz#5fc75284e9c2375c36c839411a0cf550cbfc4d5e"
+  integrity sha512-rzUyPU/S7rwUflMyLc1ETDeBj0NRuHKKAcvukozwhshr6g6c5d8zh4c2gQjY2bZ0dXeGLWc1PF174P2tVvKhfg==
+
+"d3-drag@2 - 3", d3-drag@3:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-drag/-/d3-drag-3.0.0.tgz#994aae9cd23c719f53b5e10e3a0a6108c69607ba"
+  integrity sha512-pWbUJLdETVA8lQNJecMxoXfH6x+mO2UQo8rSmZ+QqxcbyA3hfeprFgIT//HW2nlHChWeIIMwS2Fq+gEARkhTkg==
+  dependencies:
+    d3-dispatch "1 - 3"
+    d3-selection "3"
+
+"d3-dsv@1 - 3", d3-dsv@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-dsv/-/d3-dsv-3.0.1.tgz#c63af978f4d6a0d084a52a673922be2160789b73"
+  integrity sha512-UG6OvdI5afDIFP9w4G0mNq50dSOsXHJaRE8arAS5o9ApWnIElp8GZw1Dun8vP8OyHOZ/QJUKUJwxiiCCnUwm+Q==
+  dependencies:
+    commander "7"
+    iconv-lite "0.6"
+    rw "1"
+
+"d3-ease@1 - 3", d3-ease@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-ease/-/d3-ease-3.0.1.tgz#9658ac38a2140d59d346160f1f6c30fda0bd12f4"
+  integrity sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==
+
+d3-fetch@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-fetch/-/d3-fetch-3.0.1.tgz#83141bff9856a0edb5e38de89cdcfe63d0a60a22"
+  integrity sha512-kpkQIM20n3oLVBKGg6oHrUchHM3xODkTzjMoj7aWQFq5QEM+R6E4WkzT5+tojDY7yjez8KgCBRoj4aEr99Fdqw==
+  dependencies:
+    d3-dsv "1 - 3"
+
+d3-force@3:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-force/-/d3-force-3.0.0.tgz#3e2ba1a61e70888fe3d9194e30d6d14eece155c4"
+  integrity sha512-zxV/SsA+U4yte8051P4ECydjD/S+qeYtnaIyAs9tgHCqfguma/aAQDjo85A9Z6EKhBirHRJHXIgJUlffT4wdLg==
+  dependencies:
+    d3-dispatch "1 - 3"
+    d3-quadtree "1 - 3"
+    d3-timer "1 - 3"
+
+"d3-format@1 - 3", d3-format@3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/d3-format/-/d3-format-3.1.0.tgz#9260e23a28ea5cb109e93b21a06e24e2ebd55641"
+  integrity sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==
+
+d3-geo@3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/d3-geo/-/d3-geo-3.1.0.tgz#74fd54e1f4cebd5185ac2039217a98d39b0a4c0e"
+  integrity sha512-JEo5HxXDdDYXCaWdwLRt79y7giK8SbhZJbFWXqbRTolCHFI5jRqteLzCsq51NKbUoX0PjBVSohxrx+NoOUujYA==
+  dependencies:
+    d3-array "2.5.0 - 3"
+
+d3-hierarchy@3:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/d3-hierarchy/-/d3-hierarchy-3.1.2.tgz#b01cd42c1eed3d46db77a5966cf726f8c09160c6"
+  integrity sha512-FX/9frcub54beBdugHjDCdikxThEqjnR93Qt7PvQTOHxyiNCAlvMrHhclk3cD5VeAaq9fxmfRp+CnWw9rEMBuA==
+
+"d3-interpolate@1 - 3", "d3-interpolate@1.2.0 - 3", d3-interpolate@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-interpolate/-/d3-interpolate-3.0.1.tgz#3c47aa5b32c5b3dfb56ef3fd4342078a632b400d"
+  integrity sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==
+  dependencies:
+    d3-color "1 - 3"
+
+"d3-path@1 - 3", d3-path@3, d3-path@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/d3-path/-/d3-path-3.1.0.tgz#22df939032fb5a71ae8b1800d61ddb7851c42526"
+  integrity sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==
+
+d3-polygon@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-polygon/-/d3-polygon-3.0.1.tgz#0b45d3dd1c48a29c8e057e6135693ec80bf16398"
+  integrity sha512-3vbA7vXYwfe1SYhED++fPUQlWSYTTGmFmQiany/gdbiWgU/iEyQzyymwL9SkJjFFuCS4902BSzewVGsHHmHtXg==
+
+"d3-quadtree@1 - 3", d3-quadtree@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-quadtree/-/d3-quadtree-3.0.1.tgz#6dca3e8be2b393c9a9d514dabbd80a92deef1a4f"
+  integrity sha512-04xDrxQTDTCFwP5H6hRhsRcb9xxv2RzkcsygFzmkSIOJy3PeRJP7sNk3VRIbKXcog561P9oU0/rVH6vDROAgUw==
+
+d3-random@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-random/-/d3-random-3.0.1.tgz#d4926378d333d9c0bfd1e6fa0194d30aebaa20f4"
+  integrity sha512-FXMe9GfxTxqd5D6jFsQ+DJ8BJS4E/fT5mqqdjovykEB2oFbTMDVdg1MGFxfQW+FBOGoB++k8swBrgwSHT1cUXQ==
+
+d3-scale-chromatic@3:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-scale-chromatic/-/d3-scale-chromatic-3.0.0.tgz#15b4ceb8ca2bb0dcb6d1a641ee03d59c3b62376a"
+  integrity sha512-Lx9thtxAKrO2Pq6OO2Ua474opeziKr279P/TKZsMAhYyNDD3EnCffdbgeSYN5O7m2ByQsxtuP2CSDczNUIZ22g==
+  dependencies:
+    d3-color "1 - 3"
+    d3-interpolate "1 - 3"
+
+d3-scale@4:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-4.0.2.tgz#82b38e8e8ff7080764f8dcec77bd4be393689396"
+  integrity sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==
+  dependencies:
+    d3-array "2.10.0 - 3"
+    d3-format "1 - 3"
+    d3-interpolate "1.2.0 - 3"
+    d3-time "2.1.1 - 3"
+    d3-time-format "2 - 4"
+
+"d3-selection@2 - 3", d3-selection@3:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-selection/-/d3-selection-3.0.0.tgz#c25338207efa72cc5b9bd1458a1a41901f1e1b31"
+  integrity sha512-fmTRWbNMmsmWq6xJV8D19U/gw/bwrHfNXxrIN+HfZgnzqTHp9jOmKMhsTUjXOJnZOdZY9Q28y4yebKzqDKlxlQ==
+
+d3-shape@3:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/d3-shape/-/d3-shape-3.2.0.tgz#a1a839cbd9ba45f28674c69d7f855bcf91dfc6a5"
+  integrity sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==
+  dependencies:
+    d3-path "^3.1.0"
+
+"d3-time-format@2 - 4", d3-time-format@4:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/d3-time-format/-/d3-time-format-4.1.0.tgz#7ab5257a5041d11ecb4fe70a5c7d16a195bb408a"
+  integrity sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==
+  dependencies:
+    d3-time "1 - 3"
+
+"d3-time@1 - 3", "d3-time@2.1.1 - 3", d3-time@3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/d3-time/-/d3-time-3.1.0.tgz#9310db56e992e3c0175e1ef385e545e48a9bb5c7"
+  integrity sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==
+  dependencies:
+    d3-array "2 - 3"
+
+"d3-timer@1 - 3", d3-timer@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-timer/-/d3-timer-3.0.1.tgz#6284d2a2708285b1abb7e201eda4380af35e63b0"
+  integrity sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==
+
+"d3-transition@2 - 3", d3-transition@3:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/d3-transition/-/d3-transition-3.0.1.tgz#6869fdde1448868077fdd5989200cb61b2a1645f"
+  integrity sha512-ApKvfjsSR6tg06xrL434C0WydLr7JewBB3V+/39RMHsaXTOG0zmt/OAXeng5M5LBm0ojmxJrpomQVZ1aPvBL4w==
+  dependencies:
+    d3-color "1 - 3"
+    d3-dispatch "1 - 3"
+    d3-ease "1 - 3"
+    d3-interpolate "1 - 3"
+    d3-timer "1 - 3"
+
+d3-zoom@3, d3-zoom@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/d3-zoom/-/d3-zoom-3.0.0.tgz#d13f4165c73217ffeaa54295cd6969b3e7aee8f3"
+  integrity sha512-b8AmV3kfQaqWAuacbPuNbL6vahnOJflOhexLzMMNLga62+/nh0JzvJ0aO/5a5MVgUFGS7Hu1P9P03o3fJkDCyw==
+  dependencies:
+    d3-dispatch "1 - 3"
+    d3-drag "2 - 3"
+    d3-interpolate "1 - 3"
+    d3-selection "2 - 3"
+    d3-transition "2 - 3"
+
+d3@^7.8.0:
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/d3/-/d3-7.8.0.tgz#c9441f0ea9266b1003a97c2ffd53e79e9e14b1fc"
+  integrity sha512-a5rNemRadWkEfqnY5NsD4RdCP9vn8EIJ4I5Rl14U0uKH1SXqcNmk/h9aGaAF1O98lz6L9M0IeUcuPa9GUYbI5A==
+  dependencies:
+    d3-array "3"
+    d3-axis "3"
+    d3-brush "3"
+    d3-chord "3"
+    d3-color "3"
+    d3-contour "4"
+    d3-delaunay "6"
+    d3-dispatch "3"
+    d3-drag "3"
+    d3-dsv "3"
+    d3-ease "3"
+    d3-fetch "3"
+    d3-force "3"
+    d3-format "3"
+    d3-geo "3"
+    d3-hierarchy "3"
+    d3-interpolate "3"
+    d3-path "3"
+    d3-polygon "3"
+    d3-quadtree "3"
+    d3-random "3"
+    d3-scale "4"
+    d3-scale-chromatic "3"
+    d3-selection "3"
+    d3-shape "3"
+    d3-time "3"
+    d3-time-format "4"
+    d3-timer "3"
+    d3-transition "3"
+    d3-zoom "3"
 
 d@1, d@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
+  resolved "https://registry.npmjs.org/d/-/d-1.0.1.tgz"
   integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
   dependencies:
     es5-ext "^0.10.50"
     type "^1.0.1"
 
-data-urls@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
-  integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
+data-urls@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.2.tgz#9cf24a477ae22bcef5cd5f6f0bfbc1d2d3be9143"
+  integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==
   dependencies:
-    abab "^2.0.3"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.0.0"
+    abab "^2.0.6"
+    whatwg-mimetype "^3.0.0"
+    whatwg-url "^11.0.0"
 
 date-fns-tz@^1.3.3:
   version "1.3.6"
-  resolved "https://registry.yarnpkg.com/date-fns-tz/-/date-fns-tz-1.3.6.tgz#4195a58a2f86eda55ea69fb477f3ed8a6e2188ac"
+  resolved "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.6.tgz"
   integrity sha512-C8q7mErvG4INw1ZwAFmPlGjEo5Sv4udjKVbTc03zpP9cu6cp5AemFzKhz0V68LGcWEtX5mJudzzg3G04emIxLA==
 
 date-fns@^2.28.0:
   version "2.29.1"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.1.tgz#9667c2615525e552b5135a3116b95b1961456e60"
+  resolved "https://registry.npmjs.org/date-fns/-/date-fns-2.29.1.tgz"
   integrity sha512-dlLD5rKaKxpFdnjrs+5azHDFOPEu4ANy/LTh04A1DTzMM7qoajmKCBc8pkKRFT41CNzw+4gQh79X5C+Jq27HAw==
 
 date-format@^4.0.13:
   version "4.0.13"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.13.tgz#87c3aab3a4f6f37582c5f5f63692d2956fa67890"
+  resolved "https://registry.npmjs.org/date-format/-/date-format-4.0.13.tgz"
   integrity sha512-bnYCwf8Emc3pTD8pXnre+wfnjGtfi5ncMDKy7+cWZXbmRAsdWkOQHrfC1yz/KiwP5thDp2kCHWYWKBX4HP1hoQ==
 
 de-indent@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
+  resolved "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"
   integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==
 
 debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
   version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
 debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
   version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
 decamelize@^1.1.1:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
+  resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
   integrity sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==
 
-decimal.js@^10.2.1:
-  version "10.3.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
-  integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
+decimal.js@^10.4.2:
+  version "10.4.3"
+  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.4.3.tgz#1044092884d245d1b7f65725fa4ad4c6f781cc23"
+  integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
 
-decode-uri-component@^0.2.0, decode-uri-component@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.1.tgz#e9d7afd716fc1a7ec6ae7cc0aa3e540a1eac2e9d"
-  integrity sha512-XZHyaFJ6QMWhYmlz+UcmtaLeecNiXwkTGzCqG5WByt+1P1HnU6Siwf0TeP3OsZmlnGqQRSEMIxue0LLCaGY3dw==
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"
+  integrity sha512-hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og==
+
+decode-uri-component@^0.2.1:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 dedent@^0.7.0:
   version "0.7.0"
-  resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
+  resolved "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz"
   integrity sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==
 
 deep-equal@^2.0.5:
@@ -3983,41 +4537,41 @@ deep-equal@^2.0.5:
 
 deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
 deepmerge@^4.2.2:
   version "4.2.2"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
+  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
 
 default-compare@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/default-compare/-/default-compare-1.0.0.tgz#cb61131844ad84d84788fb68fd01681ca7781a2f"
+  resolved "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz"
   integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==
   dependencies:
     kind-of "^5.0.2"
 
 default-gateway@^6.0.3:
   version "6.0.3"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
+  resolved "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz"
   integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==
   dependencies:
     execa "^5.0.0"
 
 default-resolution@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/default-resolution/-/default-resolution-2.0.0.tgz#bcb82baa72ad79b426a76732f1a81ad6df26d684"
+  resolved "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz"
   integrity sha512-2xaP6GiwVwOEbXCGoJ4ufgC76m8cj805jrghScewJC2ZDsb9U0b4BIrba+xt/Uytyd0HvQ6+WymSRTfnYj59GQ==
 
 define-lazy-prop@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
+  resolved "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
 define-properties@^1.1.3, define-properties@^1.1.4:
   version "1.1.4"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1"
+  resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"
   integrity sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==
   dependencies:
     has-property-descriptors "^1.0.0"
@@ -4025,21 +4579,21 @@ define-properties@^1.1.3, define-properties@^1.1.4:
 
 define-property@^0.2.5:
   version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  resolved "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"
   integrity sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==
   dependencies:
     is-descriptor "^0.1.0"
 
 define-property@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  resolved "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"
   integrity sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==
   dependencies:
     is-descriptor "^1.0.0"
 
 define-property@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  resolved "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"
   integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
   dependencies:
     is-descriptor "^1.0.2"
@@ -4047,7 +4601,7 @@ define-property@^2.0.2:
 
 del@^6.0.0:
   version "6.1.1"
-  resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a"
+  resolved "https://registry.npmjs.org/del/-/del-6.1.1.tgz"
   integrity sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==
   dependencies:
     globby "^11.0.1"
@@ -4059,100 +4613,112 @@ del@^6.0.0:
     rimraf "^3.0.2"
     slash "^3.0.0"
 
+delaunator@5:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/delaunator/-/delaunator-5.0.0.tgz#60f052b28bd91c9b4566850ebf7756efe821d81b"
+  integrity sha512-AyLvtyJdbv/U1GkiS6gUUzclRoAY4Gs75qkMygJJhU75LW4DNuSF2RMzpxs9jw9Oz1BobHjTdkG3zdP55VxAqw==
+  dependencies:
+    robust-predicates "^3.0.0"
+
 delayed-stream@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
+  resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
 depd@2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
 depd@~1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
+  resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
   integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
 destroy@1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
+  resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
 detect-file@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+  resolved "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"
   integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==
 
 detect-newline@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
+  resolved "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
 detect-node@^2.0.4:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
+  resolved "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
 di@^0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
+  resolved "https://registry.npmjs.org/di/-/di-0.0.1.tgz"
   integrity sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==
 
 diff-sequences@^27.5.1:
   version "27.5.1"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-27.5.1.tgz#eaecc0d327fd68c8d9672a1e64ab8dccb2ef5327"
+  resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.1.tgz"
   integrity sha512-k1gCAXAsNgLwEL+Y8Wvl+M6oEFj5bgazfZULpS5CneoPPXRaCCW7dm+q21Ky2VEE5X+VeRDBVg1Pcvvsr4TtNQ==
 
 diff-sequences@^28.1.1:
   version "28.1.1"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-28.1.1.tgz#9989dc731266dc2903457a70e996f3a041913ac6"
+  resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-28.1.1.tgz"
   integrity sha512-FU0iFaH/E23a+a718l8Qa/19bF9p06kgE0KipMOMadwa3SjnaElKzPaUC0vnibs6/B/9ni97s61mcejk8W1fQw==
 
+diff-sequences@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-29.3.1.tgz#104b5b95fe725932421a9c6e5b4bef84c3f2249e"
+  integrity sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ==
+
 diff@^5.0.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40"
+  resolved "https://registry.npmjs.org/diff/-/diff-5.1.0.tgz"
   integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==
 
 dir-glob@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
   integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
   dependencies:
     path-type "^4.0.0"
 
 dns-equal@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
+  resolved "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"
   integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==
 
 dns-packet@^5.2.2:
   version "5.4.0"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-5.4.0.tgz#1f88477cf9f27e78a213fb6d118ae38e759a879b"
+  resolved "https://registry.npmjs.org/dns-packet/-/dns-packet-5.4.0.tgz"
   integrity sha512-EgqGeaBB8hLiHLZtp/IbaDQTL8pZ0+IvwzSHA6d7VyMDM+B9hgddEMa9xjK5oYnw0ci0JQ6g2XCD7/f6cafU6g==
   dependencies:
     "@leichtgewicht/ip-codec" "^2.0.1"
 
 doctrine@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"
   integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
   dependencies:
     esutils "^2.0.2"
 
 dom-accessibility-api@^0.5.6:
   version "0.5.14"
-  resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.5.14.tgz#56082f71b1dc7aac69d83c4285eef39c15d93f56"
+  resolved "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.14.tgz"
   integrity sha512-NMt+m9zFMPZe0JcY9gN224Qvk6qLIdqex29clBvc/y75ZBX9YA9wNK3frsYvu2DI1xcCIwxwnX+TlsJ2DSOADg==
 
 dom-event-types@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/dom-event-types/-/dom-event-types-1.1.0.tgz#120c1f92ddea7758db1ccee0a100a33c39f4701b"
+  resolved "https://registry.npmjs.org/dom-event-types/-/dom-event-types-1.1.0.tgz"
   integrity sha512-jNCX+uNJ3v38BKvPbpki6j5ItVlnSqVV6vDWGS6rExzCMjsc39frLjm1n91o6YaKK6AZl0wLloItW6C6mr61BQ==
 
 dom-serialize@^2.2.1:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
+  resolved "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz"
   integrity sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ==
   dependencies:
     custom-event "~1.0.0"
@@ -4162,7 +4728,7 @@ dom-serialize@^2.2.1:
 
 dom-serializer@^1.0.1:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
+  resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"
   integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
   dependencies:
     domelementtype "^2.0.1"
@@ -4171,36 +4737,36 @@ dom-serializer@^1.0.1:
 
 dom-to-image@^2.6.0:
   version "2.6.0"
-  resolved "https://registry.yarnpkg.com/dom-to-image/-/dom-to-image-2.6.0.tgz#8a503608088c87b1c22f9034ae032e1898955867"
+  resolved "https://registry.npmjs.org/dom-to-image/-/dom-to-image-2.6.0.tgz"
   integrity sha512-Dt0QdaHmLpjURjU7Tnu3AgYSF2LuOmksSGsUcE6ItvJoCWTBEmiMXcqBdNSAm9+QbbwD7JMoVsuuKX6ZVQv1qA==
 
 domelementtype@^2.0.1, domelementtype@^2.2.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+  resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"
   integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
 
-domexception@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
-  integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
+domexception@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
+  integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==
   dependencies:
-    webidl-conversions "^5.0.0"
+    webidl-conversions "^7.0.0"
 
 domhandler@^4.2.0, domhandler@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
+  resolved "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"
   integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
   dependencies:
     domelementtype "^2.2.0"
 
 dompurify@^2.2.0:
   version "2.3.10"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.10.tgz#901f7390ffe16a91a5a556b94043314cd4850385"
+  resolved "https://registry.npmjs.org/dompurify/-/dompurify-2.3.10.tgz"
   integrity sha512-o7Fg/AgC7p/XpKjf/+RC3Ok6k4St5F7Q6q6+Nnm3p2zGWioAY6dh0CbbuwOhH2UcSzKsdniE/YnE2/92JcsA+g==
 
 domutils@^2.8.0:
   version "2.8.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+  resolved "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"
   integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
   dependencies:
     dom-serializer "^1.0.1"
@@ -4209,7 +4775,7 @@ domutils@^2.8.0:
 
 dot-case@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
+  resolved "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz"
   integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
   dependencies:
     no-case "^3.0.4"
@@ -4217,14 +4783,14 @@ dot-case@^3.0.4:
 
 dumpmeta-webpack-plugin@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/dumpmeta-webpack-plugin/-/dumpmeta-webpack-plugin-0.2.0.tgz#c3a9da7d163ad3bb1d0373fb2c0bf5bb9b626b8f"
+  resolved "https://registry.npmjs.org/dumpmeta-webpack-plugin/-/dumpmeta-webpack-plugin-0.2.0.tgz"
   integrity sha512-9oxLTPvYVtk7HOmOq2rGQlvajCNiXtIKLInIrdNpdgzeoMMELaAsRsRBZfm6xf0JuwyBfytdJxsmtM6luTeqzA==
   dependencies:
     webpack ">=4.0.0 <6.0.0"
 
 duplexify@^3.6.0:
   version "3.7.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"
+  resolved "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"
   integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
   dependencies:
     end-of-stream "^1.0.0"
@@ -4234,7 +4800,7 @@ duplexify@^3.6.0:
 
 each-props@^1.3.2:
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/each-props/-/each-props-1.3.2.tgz#ea45a414d16dd5cfa419b1a81720d5ca06892333"
+  resolved "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz"
   integrity sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==
   dependencies:
     is-plain-object "^2.0.1"
@@ -4242,7 +4808,7 @@ each-props@^1.3.2:
 
 editorconfig@^0.15.3:
   version "0.15.3"
-  resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
+  resolved "https://registry.npmjs.org/editorconfig/-/editorconfig-0.15.3.tgz"
   integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==
   dependencies:
     commander "^2.19.0"
@@ -4252,23 +4818,28 @@ editorconfig@^0.15.3:
 
 ee-first@1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
 electron-to-chromium@^1.4.202:
   version "1.4.213"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.213.tgz#a0d0f535e4fbddc25196c91ff2964b5660932297"
+  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.213.tgz"
   integrity sha512-+3DbGHGOCHTVB/Ms63bGqbyC1b8y7Fk86+7ltssB8NQrZtSCvZG6eooSl9U2Q0yw++fL2DpHKOdTU0NVEkFObg==
 
+electron-to-chromium@^1.4.251:
+  version "1.4.284"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592"
+  integrity sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==
+
 elkjs@^0.7.1:
   version "0.7.1"
-  resolved "https://registry.yarnpkg.com/elkjs/-/elkjs-0.7.1.tgz#4751c5e918a4988139baf7f214e010aea22de969"
+  resolved "https://registry.npmjs.org/elkjs/-/elkjs-0.7.1.tgz"
   integrity sha512-lD86RWdh480/UuRoHhRcnv2IMkIcK6yMDEuT8TPBIbO3db4HfnVF+1lgYdQi99Ck0yb+lg5Eb46JCHI5uOsmAw==
 
-emittery@^0.8.1:
-  version "0.8.1"
-  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.8.1.tgz#bb23cc86d03b30aa75a7f734819dee2e1ba70860"
-  integrity sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==
+emittery@^0.13.1:
+  version "0.13.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.13.1.tgz#c04b8c3457490e0847ae51fced3af52d338e3dad"
+  integrity sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==
 
 emoji-regex@^10.0.0:
   version "10.1.0"
@@ -4277,35 +4848,35 @@ emoji-regex@^10.0.0:
 
 emoji-regex@^8.0.0:
   version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
 emojis-list@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  resolved "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
 encodeurl@~1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
 engine.io-parser@~5.0.3:
   version "5.0.4"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.4.tgz#0b13f704fa9271b3ec4f33112410d8f3f41d0fc0"
+  resolved "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.4.tgz"
   integrity sha512-+nVFp+5z1E3HcToEnO7ZIj3g+3k9389DvWtvJZz0T6/eOCPIyyxehFcedoYrZQrp0LgQbD9pPXhpMBKMd5QURg==
 
 engine.io@~6.2.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.2.1.tgz#e3f7826ebc4140db9bbaa9021ad6b1efb175878f"
-  integrity sha512-ECceEFcAaNRybd3lsGQKas3ZlMVjN3cyWwMP25D2i0zWfyiytVbTpRPa34qrr+FHddtpBVOmq4H/DCv1O0lZRA==
+  version "6.2.0"
+  resolved "https://registry.npmjs.org/engine.io/-/engine.io-6.2.0.tgz"
+  integrity sha512-4KzwW3F3bk+KlzSOY57fj/Jx6LyRQ1nbcyIadehl+AnXjKT7gDO0ORdRi/84ixvMKTym6ZKuxvbzN62HDDU1Lg==
   dependencies:
     "@types/cookie" "^0.4.1"
     "@types/cors" "^2.8.12"
@@ -4318,59 +4889,64 @@ engine.io@~6.2.0:
     engine.io-parser "~5.0.3"
     ws "~8.2.3"
 
-enhanced-resolve@^5.0.0:
-  version "5.9.3"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.3.tgz#44a342c012cbc473254af5cc6ae20ebd0aae5d88"
-  integrity sha512-Bq9VSor+kjvW3f9/MiiR4eE3XYgOl7/rS8lnSxbRbF3kS0B2r+Y9w5krBWxZgDxASVZbdYrn5wT4j/Wb0J9qow==
+enhanced-resolve@^5.0.0, enhanced-resolve@^5.10.0:
+  version "5.10.0"
+  resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz"
+  integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-enhanced-resolve@^5.10.0:
-  version "5.10.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.10.0.tgz#0dc579c3bb2a1032e357ac45b8f3a6f3ad4fb1e6"
-  integrity sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==
+enhanced-resolve@^5.7.0:
+  version "5.12.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
+  integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
 ent@~2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+  resolved "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"
   integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
 
 entities@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
+entities@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-4.4.0.tgz#97bdaba170339446495e653cfd2db78962900174"
+  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
+
 entities@~2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5"
+  resolved "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz"
   integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==
 
 envinfo@^7.7.3:
   version "7.8.1"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
+  resolved "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz"
   integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
 
 error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
 error-stack-parser@^2.0.1:
   version "2.1.4"
-  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.1.4.tgz#229cb01cdbfa84440bfa91876285b94680188286"
+  resolved "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz"
   integrity sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==
   dependencies:
     stackframe "^1.3.4"
 
 es-abstract@^1.19.0, es-abstract@^1.19.5, es-abstract@^1.20.0:
   version "1.20.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.20.1.tgz#027292cd6ef44bd12b1913b828116f54787d1814"
+  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.20.1.tgz"
   integrity sha512-WEm2oBhfoI2sImeM4OF2zE2V3BYdSF+KnSi9Sidz51fQHd7+JuF8Xgcj9/0o+OWeIeIS/MiuNnlruQrJf16GQA==
   dependencies:
     call-bind "^1.0.2"
@@ -4413,12 +4989,12 @@ es-get-iterator@^1.1.2:
 
 es-module-lexer@^0.9.0:
   version "0.9.3"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
+  resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz"
   integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"
   integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
   dependencies:
     is-callable "^1.1.4"
@@ -4427,7 +5003,7 @@ es-to-primitive@^1.2.1:
 
 es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50:
   version "0.10.62"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5"
+  resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.62.tgz"
   integrity sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA==
   dependencies:
     es6-iterator "^2.0.3"
@@ -4436,7 +5012,7 @@ es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50:
 
 es6-iterator@^2.0.1, es6-iterator@^2.0.3:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  resolved "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"
   integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==
   dependencies:
     d "1"
@@ -4445,12 +5021,12 @@ es6-iterator@^2.0.1, es6-iterator@^2.0.3:
 
 es6-object-assign@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
+  resolved "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz"
   integrity sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==
 
 es6-symbol@^3.1.1, es6-symbol@^3.1.3:
   version "3.1.3"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
+  resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz"
   integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
   dependencies:
     d "^1.0.1"
@@ -4458,7 +5034,7 @@ es6-symbol@^3.1.1, es6-symbol@^3.1.3:
 
 es6-weak-map@^2.0.1:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/es6-weak-map/-/es6-weak-map-2.0.3.tgz#b6da1f16cc2cc0d9be43e6bdbfc5e7dfcdf31d53"
+  resolved "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz"
   integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==
   dependencies:
     d "1"
@@ -4468,32 +5044,32 @@ es6-weak-map@^2.0.1:
 
 escalade@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
 escape-html@~1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"
   integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
 escape-string-regexp@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
   integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 escape-string-regexp@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
+  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
 escape-string-regexp@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
 escodegen@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
+  resolved "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz"
   integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
   dependencies:
     esprima "^4.0.1"
@@ -4505,7 +5081,7 @@ escodegen@^2.0.0:
 
 eslint-plugin-compat@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-compat/-/eslint-plugin-compat-4.0.2.tgz#b058627a7d25d352adf0ec16dca8fcf92d9c7af7"
+  resolved "https://registry.npmjs.org/eslint-plugin-compat/-/eslint-plugin-compat-4.0.2.tgz"
   integrity sha512-xqvoO54CLTVaEYGMzhu35Wzwk/As7rCvz/2dqwnFiWi0OJccEtGIn+5qq3zqIu9nboXlpdBN579fZcItC73Ycg==
   dependencies:
     "@mdn/browser-compat-data" "^4.1.5"
@@ -4541,7 +5117,7 @@ eslint-plugin-vuejs-accessibility@^2.0.0:
 
 eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
   dependencies:
     esrecurse "^4.3.0"
@@ -4549,7 +5125,7 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1:
 
 eslint-scope@^7.1.1:
   version "7.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
+  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz"
   integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
   dependencies:
     esrecurse "^4.3.0"
@@ -4557,25 +5133,25 @@ eslint-scope@^7.1.1:
 
 eslint-utils@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
+  resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"
   integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
+eslint-visitor-keys@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
+  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
 eslint-visitor-keys@^3.3.0:
   version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
+  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz"
   integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
 eslint@^8.27.0:
-  version "8.27.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.27.0.tgz#d547e2f7239994ad1faa4bb5d84e5d809db7cf64"
-  integrity sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ==
+  version "8.28.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.28.0.tgz#81a680732634677cc890134bcdd9fdfea8e63d6e"
+  integrity sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ==
   dependencies:
     "@eslint/eslintrc" "^1.3.3"
     "@humanwhocodes/config-array" "^0.11.6"
@@ -4619,7 +5195,7 @@ eslint@^8.27.0:
 
 espree@^9.3.1:
   version "9.3.3"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.3.tgz#2dd37c4162bb05f433ad3c1a52ddf8a49dc08e9d"
+  resolved "https://registry.npmjs.org/espree/-/espree-9.3.3.tgz"
   integrity sha512-ORs1Rt/uQTqUKjDdGCyrtYxbazf5umATSf/K4qxjmZHORR6HJk+2s/2Pqe+Kk49HHINC/xNIrGfgh8sZcll0ng==
   dependencies:
     acorn "^8.8.0"
@@ -4637,56 +5213,56 @@ espree@^9.4.0:
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
+  resolved "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"
   integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
   dependencies:
     estraverse "^5.1.0"
 
 esrecurse@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"
   integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
     estraverse "^5.2.0"
 
 estraverse@^4.1.1:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 estraverse@^5.1.0, estraverse@^5.2.0:
   version "5.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
 esutils@^2.0.2:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
 etag@~1.8.1:
   version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"
   integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
 eventemitter3@^4.0.0:
   version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
 events@^3.2.0:
   version "3.3.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  resolved "https://registry.npmjs.org/events/-/events-3.3.0.tgz"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
 execa@^5.0.0:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
   dependencies:
     cross-spawn "^7.0.3"
@@ -4701,12 +5277,12 @@ execa@^5.0.0:
 
 exit@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
+  resolved "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz"
   integrity sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==
 
 expand-brackets@^2.1.4:
   version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  resolved "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"
   integrity sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==
   dependencies:
     debug "^2.3.3"
@@ -4719,29 +5295,30 @@ expand-brackets@^2.1.4:
 
 expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  resolved "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"
   integrity sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-27.5.1.tgz#83ce59f1e5bdf5f9d2b94b61d2050db48f3fef74"
-  integrity sha512-E1q5hSUG2AmYQwQJ041nvgpkODHQvB+RKlB4IYdru6uJsyFTRyZAP463M+1lINorwbqAmUggi6+WwkD8lCS/Dw==
+expect@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-29.3.1.tgz#92877aad3f7deefc2e3f6430dd195b92295554a6"
+  integrity sha512-gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA==
   dependencies:
-    "@jest/types" "^27.5.1"
-    jest-get-type "^27.5.1"
-    jest-matcher-utils "^27.5.1"
-    jest-message-util "^27.5.1"
+    "@jest/expect-utils" "^29.3.1"
+    jest-get-type "^29.2.0"
+    jest-matcher-utils "^29.3.1"
+    jest-message-util "^29.3.1"
+    jest-util "^29.3.1"
 
 expose-loader@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/expose-loader/-/expose-loader-4.0.0.tgz#aa6f06f57cbc904175de4fe4eaff6211337e0231"
+  resolved "https://registry.npmjs.org/expose-loader/-/expose-loader-4.0.0.tgz"
   integrity sha512-kUEvHyf6MPR2ubZCL9aziP9Br5wxMvq1cghTpYhM6MW52NPq+7hXixw2EqQuI1SvGb1fDjc2ehJOg6645wR6ww==
 
 express@^4.17.3:
   version "4.18.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.18.1.tgz#7797de8b9c72c857b9cd0e14a5eea80666267caf"
+  resolved "https://registry.npmjs.org/express/-/express-4.18.1.tgz"
   integrity sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==
   dependencies:
     accepts "~1.3.8"
@@ -4778,21 +5355,21 @@ express@^4.17.3:
 
 ext@^1.1.2:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/ext/-/ext-1.6.0.tgz#3871d50641e874cc172e2b53f919842d19db4c52"
+  resolved "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz"
   integrity sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==
   dependencies:
     type "^2.5.0"
 
 extend-shallow@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
+  resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"
   integrity sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==
   dependencies:
     is-extendable "^0.1.0"
 
 extend-shallow@^3.0.0, extend-shallow@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"
   integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==
   dependencies:
     assign-symbols "^1.0.0"
@@ -4800,12 +5377,12 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
 
 extend@^3.0.0:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 extglob@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  resolved "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"
   integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
     array-unique "^0.3.2"
@@ -4819,7 +5396,7 @@ extglob@^2.0.4:
 
 fancy-log@^1.3.2:
   version "1.3.3"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
+  resolved "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz"
   integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
   dependencies:
     ansi-gray "^0.1.1"
@@ -4829,7 +5406,7 @@ fancy-log@^1.3.2:
 
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
 fast-glob@^3.2.12:
@@ -4845,7 +5422,7 @@ fast-glob@^3.2.12:
 
 fast-glob@^3.2.9:
   version "3.2.11"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
+  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz"
   integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
@@ -4854,74 +5431,74 @@ fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0:
+fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
 fast-levenshtein@^1.0.0:
   version "1.1.4"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz#e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"
+  resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz"
   integrity sha512-Ia0sQNrMPXXkqVFt6w6M1n1oKo3NfKs+mvaV811Jwir7vAk9a6PVV9VPYf6X3BU97QiLEmuW3uXH9u87zDFfdw==
 
 fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fastest-levenshtein@^1.0.12:
   version "1.0.16"
-  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
+  resolved "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz"
   integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
 
 fastq@^1.6.0:
   version "1.13.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
+  resolved "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"
   integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
   dependencies:
     reusify "^1.0.4"
 
 faye-websocket@^0.11.3:
   version "0.11.4"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
+  resolved "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz"
   integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
   dependencies:
     websocket-driver ">=0.5.1"
 
 fb-watchman@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.1.tgz#fc84fb39d2709cf3ff6d743706157bb5708a8a85"
+  resolved "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz"
   integrity sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==
   dependencies:
     bser "2.1.1"
 
 fetch-ponyfill@^7.1.0:
   version "7.1.0"
-  resolved "https://registry.yarnpkg.com/fetch-ponyfill/-/fetch-ponyfill-7.1.0.tgz#4266ed48b4e64663a50ab7f7fcb8e76f990526d0"
+  resolved "https://registry.npmjs.org/fetch-ponyfill/-/fetch-ponyfill-7.1.0.tgz"
   integrity sha512-FhbbL55dj/qdVO3YNK7ZEkshvj3eQ7EuIGV2I6ic/2YiocvyWv+7jg2s4AyS0wdRU75s3tA8ZxI/xPigb0v5Aw==
   dependencies:
     node-fetch "~2.6.1"
 
 fflate@^0.4.8:
   version "0.4.8"
-  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.4.8.tgz#f90b82aefbd8ac174213abb338bd7ef848f0f5ae"
+  resolved "https://registry.npmjs.org/fflate/-/fflate-0.4.8.tgz"
   integrity sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==
 
 file-entry-cache@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
   integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
   dependencies:
     flat-cache "^3.0.4"
 
 file-saver@^2.0.5:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
+  resolved "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz"
   integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==
 
 fill-range@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  resolved "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"
   integrity sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==
   dependencies:
     extend-shallow "^2.0.1"
@@ -4931,14 +5508,14 @@ fill-range@^4.0.0:
 
 fill-range@^7.0.1:
   version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
   integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
   dependencies:
     to-regex-range "^5.0.1"
 
 finalhandler@1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"
   integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
   dependencies:
     debug "2.6.9"
@@ -4951,7 +5528,7 @@ finalhandler@1.1.2:
 
 finalhandler@1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
+  resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"
   integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
   dependencies:
     debug "2.6.9"
@@ -4962,23 +5539,14 @@ finalhandler@1.2.0:
     statuses "2.0.1"
     unpipe "~1.0.0"
 
-find-cache-dir@^3.3.1:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
-  integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
-  dependencies:
-    commondir "^1.0.1"
-    make-dir "^3.0.2"
-    pkg-dir "^4.1.0"
-
 find-root@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
+  resolved "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz"
   integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==
 
 find-up@^1.0.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"
   integrity sha512-jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==
   dependencies:
     path-exists "^2.0.0"
@@ -4986,7 +5554,7 @@ find-up@^1.0.0:
 
 find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
   dependencies:
     locate-path "^5.0.0"
@@ -4994,7 +5562,7 @@ find-up@^4.0.0, find-up@^4.1.0:
 
 find-up@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz"
   integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
   dependencies:
     locate-path "^6.0.0"
@@ -5002,7 +5570,7 @@ find-up@^5.0.0:
 
 findup-sync@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc"
+  resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"
   integrity sha512-vs+3unmJT45eczmcAZ6zMJtxN3l/QXeccaXQx5cu/MeJMhewVfoWZqibRkOxPnmoR59+Zy5hjabfQc6JLSah4g==
   dependencies:
     detect-file "^1.0.0"
@@ -5012,7 +5580,7 @@ findup-sync@^2.0.0:
 
 findup-sync@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
+  resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz"
   integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
   dependencies:
     detect-file "^1.0.0"
@@ -5022,7 +5590,7 @@ findup-sync@^3.0.0:
 
 fined@^1.0.1:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fined/-/fined-1.2.0.tgz#d00beccf1aa2b475d16d423b0238b713a2c4a37b"
+  resolved "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz"
   integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
   dependencies:
     expand-tilde "^2.0.2"
@@ -5033,12 +5601,12 @@ fined@^1.0.1:
 
 flagged-respawn@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.1.tgz#e7de6f1279ddd9ca9aac8a5971d618606b3aab41"
+  resolved "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz"
   integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
 
 flat-cache@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"
   integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
   dependencies:
     flatted "^3.1.0"
@@ -5046,22 +5614,22 @@ flat-cache@^3.0.4:
 
 flatted@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
+  resolved "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"
   integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
 
 flatted@^3.1.0, flatted@^3.2.6:
   version "3.2.6"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.6.tgz#022e9218c637f9f3fc9c35ab9c9193f05add60b2"
+  resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.6.tgz"
   integrity sha512-0sQoMh9s0BYsm+12Huy/rkKxVu4R1+r96YX5cG44rHV0pQ6iC3Q+mkoMFaGWObMFYQxCVT+ssG1ksneA2MI9KQ==
 
 flush-promises@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flush-promises/-/flush-promises-1.0.2.tgz#4948fd58f15281fed79cbafc86293d5bb09b2ced"
+  resolved "https://registry.npmjs.org/flush-promises/-/flush-promises-1.0.2.tgz"
   integrity sha512-G0sYfLQERwKz4+4iOZYQEZVpOt9zQrlItIxQAAYAWpfby3gbHrx0osCHz5RLl/XoXevXk0xoN4hDFky/VV9TrA==
 
 flush-write-stream@^1.0.2:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
+  resolved "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz"
   integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
   dependencies:
     inherits "^2.0.3"
@@ -5069,32 +5637,32 @@ flush-write-stream@^1.0.2:
 
 follow-redirects@^1.0.0, follow-redirects@^1.14.7:
   version "1.15.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
+  resolved "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.1.tgz"
   integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
 
 for-each@^0.3.3:
   version "0.3.3"
-  resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
+  resolved "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz"
   integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
   dependencies:
     is-callable "^1.1.3"
 
 for-in@^1.0.1, for-in@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"
   integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
 
 for-own@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  resolved "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"
   integrity sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==
   dependencies:
     for-in "^1.0.1"
 
-form-data@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
-  integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
   dependencies:
     asynckit "^0.4.0"
     combined-stream "^1.0.8"
@@ -5102,29 +5670,29 @@ form-data@^3.0.0:
 
 forwarded@0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
+  resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
 fraction.js@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
+  resolved "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz"
   integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==
 
 fragment-cache@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  resolved "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"
   integrity sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==
   dependencies:
     map-cache "^0.2.2"
 
 fresh@0.5.2:
   version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"
   integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
 fs-extra@^8.1.0:
   version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"
   integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
   dependencies:
     graceful-fs "^4.2.0"
@@ -5133,7 +5701,7 @@ fs-extra@^8.1.0:
 
 fs-mkdirp-stream@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz#0b7815fc3201c6a69e14db98ce098c16935259eb"
+  resolved "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz"
   integrity sha512-+vSd9frUnapVC2RZYfL3FCB2p3g4TBhaUmrsWlSudsGdnxIuUvBB2QM1VZeBtc49QFwrp+wQLrDs3+xxDgI5gQ==
   dependencies:
     graceful-fs "^4.1.11"
@@ -5141,27 +5709,27 @@ fs-mkdirp-stream@^1.0.0:
 
 fs-monkey@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
+  resolved "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz"
   integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
 
 fs.realpath@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@^2.3.2, fsevents@~2.3.2:
   version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
 function-bind@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
 function.prototype.name@^1.1.5:
   version "1.1.5"
-  resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
+  resolved "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz"
   integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
   dependencies:
     call-bind "^1.0.2"
@@ -5171,22 +5739,22 @@ function.prototype.name@^1.1.5:
 
 functions-have-names@^1.2.2:
   version "1.2.3"
-  resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
+  resolved "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
 get-caller-file@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
+  resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
 get-caller-file@^2.0.5:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3:
@@ -5200,7 +5768,7 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3:
 
 get-intrinsic@^1.1.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.2.tgz#336975123e05ad0b7ba41f152ee4aadbea6cf598"
+  resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz"
   integrity sha512-Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA==
   dependencies:
     function-bind "^1.1.1"
@@ -5209,17 +5777,17 @@ get-intrinsic@^1.1.0:
 
 get-package-type@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+  resolved "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
 get-stream@^6.0.0:
   version "6.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  resolved "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
 get-symbol-description@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
+  resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"
   integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
   dependencies:
     call-bind "^1.0.2"
@@ -5227,12 +5795,12 @@ get-symbol-description@^1.0.0:
 
 get-value@^2.0.3, get-value@^2.0.6:
   version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  resolved "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"
   integrity sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==
 
 glob-parent@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"
   integrity sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA==
   dependencies:
     is-glob "^3.1.0"
@@ -5240,7 +5808,7 @@ glob-parent@^3.1.0:
 
 glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
@@ -5254,7 +5822,7 @@ glob-parent@^6.0.2:
 
 glob-stream@^6.1.0:
   version "6.1.0"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-6.1.0.tgz#7045c99413b3eb94888d83ab46d0b404cc7bdde4"
+  resolved "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz"
   integrity sha512-uMbLGAP3S2aDOHUDfdoYcdIePUCfysbAd0IAoWVZbeGU/oNQ8asHVSshLDJUPWxfzj8zsCG7/XeHPHTtow0nsw==
   dependencies:
     extend "^3.0.0"
@@ -5270,12 +5838,12 @@ glob-stream@^6.1.0:
 
 glob-to-regexp@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
+  resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
 glob-watcher@^5.0.3:
   version "5.0.5"
-  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-5.0.5.tgz#aa6bce648332924d9a8489be41e3e5c52d4186dc"
+  resolved "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz"
   integrity sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==
   dependencies:
     anymatch "^2.0.0"
@@ -5286,9 +5854,9 @@ glob-watcher@^5.0.3:
     normalize-path "^3.0.0"
     object.defaults "^1.1.0"
 
-glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.7, glob@^7.2.0, glob@~7.2.0:
+glob@^7.1.1, glob@^7.1.3, glob@^7.1.4, glob@^7.1.7, glob@^7.2.0, glob@~7.2.0:
   version "7.2.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
     fs.realpath "^1.0.0"
@@ -5300,7 +5868,7 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.7, glob@^7.2.0, gl
 
 glob@^8.0.3:
   version "8.0.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.3.tgz#415c6eb2deed9e502c68fa44a272e6da6eeca42e"
+  resolved "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz"
   integrity sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==
   dependencies:
     fs.realpath "^1.0.0"
@@ -5311,7 +5879,7 @@ glob@^8.0.3:
 
 global-modules@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  resolved "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"
   integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
   dependencies:
     global-prefix "^1.0.1"
@@ -5320,7 +5888,7 @@ global-modules@^1.0.0:
 
 global-prefix@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  resolved "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"
   integrity sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==
   dependencies:
     expand-tilde "^2.0.2"
@@ -5331,24 +5899,24 @@ global-prefix@^1.0.1:
 
 globals@^11.1.0:
   version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
 globals@^13.15.0:
   version "13.17.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.17.0.tgz#902eb1e680a41da93945adbdcb5a9f361ba69bd4"
+  resolved "https://registry.npmjs.org/globals/-/globals-13.17.0.tgz"
   integrity sha512-1C+6nQRb1GwGMKm2dH/E7enFAMxGTmGI7/dEdhy/DNelv85w9B72t3uc5frtMNXIbzrarJJ/lTCjcaZwbLJmyw==
   dependencies:
     type-fest "^0.20.2"
 
 globalyzer@0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/globalyzer/-/globalyzer-0.1.0.tgz#cb76da79555669a1519d5a8edf093afaa0bf1465"
+  resolved "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz"
   integrity sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==
 
 globby@^11.0.1, globby@^11.1.0:
   version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
   dependencies:
     array-union "^2.1.0"
@@ -5360,12 +5928,12 @@ globby@^11.0.1, globby@^11.1.0:
 
 globrex@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/globrex/-/globrex-0.1.2.tgz#dd5d9ec826232730cd6793a5e33a9302985e6098"
+  resolved "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz"
   integrity sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==
 
 glogg@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f"
+  resolved "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz"
   integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==
   dependencies:
     sparkles "^1.0.0"
@@ -5379,17 +5947,17 @@ gopd@^1.0.1:
 
 graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
   version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"
   integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
 
 grapheme-splitter@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e"
+  resolved "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"
   integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
 
 gulp-cli@^2.2.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-2.3.0.tgz#ec0d380e29e52aa45e47977f0d32e18fd161122f"
+  resolved "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz"
   integrity sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==
   dependencies:
     ansi-colors "^1.0.1"
@@ -5413,7 +5981,7 @@ gulp-cli@^2.2.0:
 
 gulp@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/gulp/-/gulp-4.0.2.tgz#543651070fd0f6ab0a0650c6a3e6ff5a7cb09caa"
+  resolved "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz"
   integrity sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==
   dependencies:
     glob-watcher "^5.0.3"
@@ -5423,62 +5991,62 @@ gulp@^4.0.2:
 
 gulplog@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
+  resolved "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz"
   integrity sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==
   dependencies:
     glogg "^1.0.0"
 
 handle-thing@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
+  resolved "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
-handsontable@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/handsontable/-/handsontable-2.0.0.tgz#b22fbd61d3193eb63b9c798e73843f55856ef022"
-  integrity sha512-o8yCOgyV0LkBrEyMrGtfex4UDJ+Pw3+Eeoxk9rRg2LmlziJsgwGlz5e4W1YP3/Ew7bPW/iyGlL4q1bp+6pcD/g==
+handsontable@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/handsontable/-/handsontable-4.0.0.tgz#1a9591a3f6c2fe13564955d945ea91d20b6c4cf1"
+  integrity sha512-+i9jkz5D3+Da7bIL4+YjF4hnY/nWjR8ZfcCo9BHuHaYY/ri2CYH75OobVxpMyPTspQlXjyQoWE6v0qhHuesoUw==
   dependencies:
     moment "2.20.1"
-    numbro "1.11.0"
+    numbro "^2.0.6"
     pikaday "1.5.1"
 
 has-bigints@^1.0.1, has-bigints@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa"
+  resolved "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz"
   integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
 has-flag@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
   integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
 has-property-descriptors@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz#610708600606d36961ed04c196193b6a607fa861"
+  resolved "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"
   integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
   dependencies:
     get-intrinsic "^1.1.1"
 
 has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
 has-tostringtag@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+  resolved "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"
   integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
   dependencies:
     has-symbols "^1.0.2"
 
 has-value@^0.3.1:
   version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  resolved "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"
   integrity sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==
   dependencies:
     get-value "^2.0.3"
@@ -5487,7 +6055,7 @@ has-value@^0.3.1:
 
 has-value@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  resolved "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"
   integrity sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==
   dependencies:
     get-value "^2.0.6"
@@ -5496,12 +6064,12 @@ has-value@^1.0.0:
 
 has-values@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  resolved "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"
   integrity sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==
 
 has-values@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  resolved "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"
   integrity sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==
   dependencies:
     is-number "^3.0.0"
@@ -5509,36 +6077,36 @@ has-values@^1.0.0:
 
 has@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
 hash-sum@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"
+  resolved "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz"
   integrity sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==
 
 he@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  resolved "https://registry.npmjs.org/he/-/he-1.2.0.tgz"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
 homedir-polyfill@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
+  resolved "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"
   integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
   dependencies:
     parse-passwd "^1.0.0"
 
 hosted-git-info@^2.1.4:
   version "2.8.9"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"
   integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 hpack.js@^2.1.6:
   version "2.1.6"
-  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
+  resolved "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz"
   integrity sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==
   dependencies:
     inherits "^2.0.1"
@@ -5551,26 +6119,26 @@ hsluv@^0.1.0:
   resolved "https://registry.yarnpkg.com/hsluv/-/hsluv-0.1.0.tgz#29f40d49642bd56dd0c192122abcc723bb5c2d6c"
   integrity sha512-ERcanKLAszD2XN3Vh5r5Szkrv9q0oSTudmP0rkiKAGM/3NMc9FLmMZBB7TSqTaXJfSDBOreYTfjezCOYbRKqlw==
 
-html-encoding-sniffer@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
-  integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
+html-encoding-sniffer@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"
+  integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==
   dependencies:
-    whatwg-encoding "^1.0.5"
+    whatwg-encoding "^2.0.0"
 
 html-entities@^2.3.2:
   version "2.3.3"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46"
+  resolved "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz"
   integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==
 
 html-escaper@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
 html2canvas@^1.0.0-rc.5:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/html2canvas/-/html2canvas-1.4.1.tgz#7cef1888311b5011d507794a066041b14669a543"
+  resolved "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz"
   integrity sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==
   dependencies:
     css-line-break "^2.1.0"
@@ -5578,12 +6146,12 @@ html2canvas@^1.0.0-rc.5:
 
 http-deceiver@^1.2.7:
   version "1.2.7"
-  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
+  resolved "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"
   integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==
 
 http-errors@2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
+  resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"
   integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
   dependencies:
     depd "2.0.0"
@@ -5594,7 +6162,7 @@ http-errors@2.0.0:
 
 http-errors@~1.6.2:
   version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"
   integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
   dependencies:
     depd "~1.1.2"
@@ -5604,21 +6172,21 @@ http-errors@~1.6.2:
 
 http-parser-js@>=0.5.1:
   version "0.5.8"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.8.tgz#af23090d9ac4e24573de6f6aecc9d84a48bf20e3"
+  resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz"
   integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
 
-http-proxy-agent@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
-  integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
+http-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
   dependencies:
-    "@tootallnate/once" "1"
+    "@tootallnate/once" "2"
     agent-base "6"
     debug "4"
 
 http-proxy-middleware@^2.0.3:
   version "2.0.6"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz#e1a4dd6979572c7ab5a4e4b55095d1f32a74963f"
+  resolved "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz"
   integrity sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==
   dependencies:
     "@types/http-proxy" "^1.17.8"
@@ -5629,14 +6197,14 @@ http-proxy-middleware@^2.0.3:
 
 http-proxy@^1.18.1:
   version "1.18.1"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  resolved "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"
   integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
   dependencies:
     eventemitter3 "^4.0.0"
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-https-proxy-agent@^5.0.0:
+https-proxy-agent@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
   integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
@@ -5646,54 +6214,61 @@ https-proxy-agent@^5.0.0:
 
 human-signals@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
 iconv-lite@0.4.24:
   version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@0.6, iconv-lite@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 icss-utils@^5.0.0, icss-utils@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
+  resolved "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
 ieee754@^1.1.13, ieee754@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
 ignore-loader@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ignore-loader/-/ignore-loader-0.1.2.tgz#d81f240376d0ba4f0d778972c3ad25874117a463"
+  resolved "https://registry.npmjs.org/ignore-loader/-/ignore-loader-0.1.2.tgz"
   integrity sha512-yOJQEKrNwoYqrWLS4DcnzM7SEQhRKis5mB+LdKKh4cPmGYlLPR0ozRzHV5jmEk2IxptqJNQA5Cc0gw8Fj12bXA==
 
 ignore@^5.2.0:
   version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
+  resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"
   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
 
 imask@^6.4.0:
   version "6.4.2"
-  resolved "https://registry.yarnpkg.com/imask/-/imask-6.4.2.tgz#f1c67e6961640bf5b09d7b4a34dcf4f9a3df7e22"
+  resolved "https://registry.npmjs.org/imask/-/imask-6.4.2.tgz"
   integrity sha512-xvEgbTdk6y2dW2UAysq0NRPmO6PuaXM5NHIt4TXEJEwXUHj26M0p/fXqyrSJdNXFaGVOtqYjPRnNdrjQQhDuuA==
 
 immediate@~3.0.5:
   version "3.0.6"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
+  resolved "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz"
   integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==
 
 immutable@^4.0.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.1.0.tgz#f795787f0db780183307b9eb2091fcac1f6fafef"
+  resolved "https://registry.npmjs.org/immutable/-/immutable-4.1.0.tgz"
   integrity sha512-oNkuqVTA8jqG1Q6c+UglTOD1xhC1BtjKI7XkCXRkZHrN5m18/XsnUp8Q89GkQO/z+0WjonSvl0FLhDYftp46nQ==
 
 import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
   dependencies:
     parent-module "^1.0.0"
@@ -5701,7 +6276,7 @@ import-fresh@^3.0.0, import-fresh@^3.2.1:
 
 import-local@^3.0.2:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
+  resolved "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz"
   integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
   dependencies:
     pkg-dir "^4.2.0"
@@ -5709,7 +6284,7 @@ import-local@^3.0.2:
 
 imports-loader@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/imports-loader/-/imports-loader-4.0.0.tgz#c11574247beca48e6549db1eb603f8939884aca1"
+  resolved "https://registry.npmjs.org/imports-loader/-/imports-loader-4.0.0.tgz"
   integrity sha512-8PPbhk/9CEHd0WWKESw/oYTDhp3So9PWA9OfyIbH3kywIN4uxrWkQ8ux47xpk4yWUKX97Erbws9MFSaBlVvAjg==
   dependencies:
     source-map "^0.6.1"
@@ -5717,17 +6292,17 @@ imports-loader@^4.0.0:
 
 imurmurhash@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
   integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 indent-string@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  resolved "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
 inflight@^1.0.4:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
   integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
@@ -5735,56 +6310,61 @@ inflight@^1.0.4:
 
 inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3, inherits@~2.0.4:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 inherits@2.0.3:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
   integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
 ini@^1.3.4:
   version "1.3.8"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
+  resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 internal-slot@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
+  resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz"
   integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
   dependencies:
     get-intrinsic "^1.1.0"
     has "^1.0.3"
     side-channel "^1.0.4"
 
+"internmap@1 - 2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/internmap/-/internmap-2.0.3.tgz#6685f23755e43c524e251d29cbc97248e3061009"
+  integrity sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==
+
 interpret@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
+  resolved "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz"
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
 interpret@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
+  resolved "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz"
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 invert-kv@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
+  resolved "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"
   integrity sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==
 
 ipaddr.js@1.9.1:
   version "1.9.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+  resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
 ipaddr.js@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0"
+  resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz"
   integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==
 
 is-absolute@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
+  resolved "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"
   integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
   dependencies:
     is-relative "^1.0.0"
@@ -5792,21 +6372,21 @@ is-absolute@^1.0.0:
 
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  resolved "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"
   integrity sha512-e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A==
   dependencies:
     kind-of "^3.0.2"
 
 is-accessor-descriptor@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  resolved "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"
   integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-arguments@^1.0.4, is-arguments@^1.1.0, is-arguments@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
+  resolved "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz"
   integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
   dependencies:
     call-bind "^1.0.2"
@@ -5814,26 +6394,26 @@ is-arguments@^1.0.4, is-arguments@^1.1.0, is-arguments@^1.1.1:
 
 is-arrayish@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
+  resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
 is-bigint@^1.0.1:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+  resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"
   integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
   dependencies:
     has-bigints "^1.0.1"
 
 is-binary-path@~2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"
   integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
   dependencies:
     binary-extensions "^2.0.0"
 
 is-boolean-object@^1.1.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
+  resolved "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"
   integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
   dependencies:
     call-bind "^1.0.2"
@@ -5841,50 +6421,50 @@ is-boolean-object@^1.1.0:
 
 is-buffer@^1.1.5:
   version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
 is-buffer@^2.0.5:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
+  resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz"
   integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
 
 is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.4:
   version "1.2.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
+  resolved "https://registry.npmjs.org/is-callable/-/is-callable-1.2.4.tgz"
   integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
 
 is-core-module@^2.9.0:
   version "2.10.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.10.0.tgz#9012ede0a91c69587e647514e1d5277019e728ed"
+  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.10.0.tgz"
   integrity sha512-Erxj2n/LDAZ7H8WNJXd9tw38GYM3dv8rk8Zcs+jJuxYTW7sozH+SS8NtrSjVL1/vpLvWi1hxy96IzjJ3EHTJJg==
   dependencies:
     has "^1.0.3"
 
 is-data-descriptor@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  resolved "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"
   integrity sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==
   dependencies:
     kind-of "^3.0.2"
 
 is-data-descriptor@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  resolved "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"
   integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
   dependencies:
     kind-of "^6.0.0"
 
 is-date-object@^1.0.1, is-date-object@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+  resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"
   integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
   dependencies:
     has-tostringtag "^1.0.0"
 
 is-descriptor@^0.1.0:
   version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  resolved "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"
   integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
     is-accessor-descriptor "^0.1.6"
@@ -5893,7 +6473,7 @@ is-descriptor@^0.1.0:
 
 is-descriptor@^1.0.0, is-descriptor@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  resolved "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"
   integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
   dependencies:
     is-accessor-descriptor "^1.0.0"
@@ -5902,60 +6482,60 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
 
 is-docker@^2.0.0, is-docker@^2.1.1:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  resolved "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
+  resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"
   integrity sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==
 
 is-extendable@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
+  resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"
   integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
 is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
   integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-fullwidth-code-point@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
+  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"
   integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==
   dependencies:
     number-is-nan "^1.0.0"
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
 is-generator-fn@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
+  resolved "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
 is-generator-function@^1.0.7:
   version "1.0.10"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72"
+  resolved "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz"
   integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==
   dependencies:
     has-tostringtag "^1.0.0"
 
 is-glob@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
+  resolved "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"
   integrity sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw==
   dependencies:
     is-extglob "^2.1.0"
 
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
     is-extglob "^2.1.1"
@@ -5967,7 +6547,7 @@ is-map@^2.0.1, is-map@^2.0.2:
 
 is-nan@^1.2.1:
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
+  resolved "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz"
   integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
   dependencies:
     call-bind "^1.0.0"
@@ -5975,73 +6555,73 @@ is-nan@^1.2.1:
 
 is-negated-glob@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
+  resolved "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz"
   integrity sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==
 
 is-negative-zero@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
+  resolved "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz"
   integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
 
 is-number-object@^1.0.4:
   version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.7.tgz#59d50ada4c45251784e9904f5246c742f07a42fc"
+  resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz"
   integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
   dependencies:
     has-tostringtag "^1.0.0"
 
 is-number@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  resolved "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"
   integrity sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==
   dependencies:
     kind-of "^3.0.2"
 
 is-number@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
+  resolved "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz"
   integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
 is-number@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
 is-path-cwd@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
+  resolved "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"
   integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
 
 is-path-inside@^3.0.2, is-path-inside@^3.0.3:
   version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
 is-plain-obj@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
+  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz"
   integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
 
 is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-plain-object@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"
   integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
 
 is-potential-custom-element-name@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+  resolved "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
 is-regex@^1.1.4:
   version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+  resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"
   integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
   dependencies:
     call-bind "^1.0.2"
@@ -6049,7 +6629,7 @@ is-regex@^1.1.4:
 
 is-relative@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
+  resolved "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"
   integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
   dependencies:
     is-unc-path "^1.0.0"
@@ -6061,26 +6641,26 @@ is-set@^2.0.1, is-set@^2.0.2:
 
 is-shared-array-buffer@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79"
+  resolved "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"
   integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
   dependencies:
     call-bind "^1.0.2"
 
 is-stream@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
+  resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"
   integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
   dependencies:
     has-tostringtag "^1.0.0"
 
 is-symbol@^1.0.2, is-symbol@^1.0.3:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz"
   integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
   dependencies:
     has-symbols "^1.0.2"
@@ -6098,7 +6678,7 @@ is-typed-array@^1.1.10:
 
 is-typed-array@^1.1.3, is-typed-array@^1.1.9:
   version "1.1.9"
-  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.9.tgz#246d77d2871e7d9f5aeb1d54b9f52c71329ece67"
+  resolved "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.9.tgz"
   integrity sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==
   dependencies:
     available-typed-arrays "^1.0.5"
@@ -6107,26 +6687,21 @@ is-typed-array@^1.1.3, is-typed-array@^1.1.9:
     for-each "^0.3.3"
     has-tostringtag "^1.0.0"
 
-is-typedarray@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
-
 is-unc-path@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
+  resolved "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz"
   integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
   dependencies:
     unc-path-regex "^0.1.2"
 
 is-utf8@^0.2.0, is-utf8@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+  resolved "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"
   integrity sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==
 
 is-valid-glob@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
+  resolved "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz"
   integrity sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==
 
 is-weakmap@^2.0.1:
@@ -6136,7 +6711,7 @@ is-weakmap@^2.0.1:
 
 is-weakref@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
+  resolved "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz"
   integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
   dependencies:
     call-bind "^1.0.2"
@@ -6151,29 +6726,29 @@ is-weakset@^2.0.1:
 
 is-whitespace@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-whitespace/-/is-whitespace-0.3.0.tgz#1639ecb1be036aec69a54cbb401cfbed7114ab7f"
+  resolved "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz"
   integrity sha512-RydPhl4S6JwAyj0JJjshWJEFG6hNye3pZFBRZaTUfZFwGHxzppNaNOVgQuS/E/SlhrApuMXrpnK1EEIXfdo3Dg==
 
 is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 is-wsl@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"
   integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
   dependencies:
     is-docker "^2.0.0"
 
 isarray@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
   integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
 isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
   integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
 isarray@^2.0.5:
@@ -6183,34 +6758,34 @@ isarray@^2.0.5:
 
 isbinaryfile@^4.0.8:
   version "4.0.10"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3"
+  resolved "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz"
   integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
 
 isexe@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 isobject@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
+  resolved "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"
   integrity sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==
   dependencies:
     isarray "1.0.0"
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"
   integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
+  resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz"
   integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
 
 istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
   version "5.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz#31d18bdd127f825dd02ea7bfdfd906f8ab840e9f"
+  resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz"
   integrity sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==
   dependencies:
     "@babel/core" "^7.12.3"
@@ -6221,7 +6796,7 @@ istanbul-lib-instrument@^5.0.4, istanbul-lib-instrument@^5.1.0:
 
 istanbul-lib-report@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
+  resolved "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"
   integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
   dependencies:
     istanbul-lib-coverage "^3.0.0"
@@ -6230,7 +6805,7 @@ istanbul-lib-report@^3.0.0:
 
 istanbul-lib-source-maps@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz#895f3a709fcfba34c6de5a42939022f3e4358551"
+  resolved "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz"
   integrity sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==
   dependencies:
     debug "^4.1.1"
@@ -6239,7 +6814,7 @@ istanbul-lib-source-maps@^4.0.0:
 
 istanbul-reports@^3.1.3:
   version "3.1.5"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae"
+  resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz"
   integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
   dependencies:
     html-escaper "^2.0.0"
@@ -6247,94 +6822,91 @@ istanbul-reports@^3.1.3:
 
 javascript-stringify@^2.0.1:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-2.1.0.tgz#27c76539be14d8bd128219a2d731b09337904e79"
+  resolved "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-2.1.0.tgz"
   integrity sha512-JVAfqNPTvNq3sB/VHQJAFxN/sPgKnsKrCwyRt15zwNCdrMMJDdcEOdubuy+DuJYYdm0ox1J4uzEuYKkN+9yhVg==
 
-jest-changed-files@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-27.5.1.tgz#a348aed00ec9bf671cc58a66fcbe7c3dfd6a68f5"
-  integrity sha512-buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw==
+jest-changed-files@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-29.2.0.tgz#b6598daa9803ea6a4dce7968e20ab380ddbee289"
+  integrity sha512-qPVmLLyBmvF5HJrY7krDisx6Voi8DmlV3GZYX0aFNbaQsZeoz1hfxcCMbqDGuQCxU1dJy9eYc2xscE8QrCCYaA==
   dependencies:
-    "@jest/types" "^27.5.1"
     execa "^5.0.0"
-    throat "^6.0.1"
+    p-limit "^3.1.0"
 
-jest-circus@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-27.5.1.tgz#37a5a4459b7bf4406e53d637b49d22c65d125ecc"
-  integrity sha512-D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw==
+jest-circus@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-circus/-/jest-circus-29.3.1.tgz#177d07c5c0beae8ef2937a67de68f1e17bbf1b4a"
+  integrity sha512-wpr26sEvwb3qQQbdlmei+gzp6yoSSoSL6GsLPxnuayZSMrSd5Ka7IjAvatpIernBvT2+Ic6RLTg+jSebScmasg==
   dependencies:
-    "@jest/environment" "^27.5.1"
-    "@jest/test-result" "^27.5.1"
-    "@jest/types" "^27.5.1"
+    "@jest/environment" "^29.3.1"
+    "@jest/expect" "^29.3.1"
+    "@jest/test-result" "^29.3.1"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
     dedent "^0.7.0"
-    expect "^27.5.1"
     is-generator-fn "^2.0.0"
-    jest-each "^27.5.1"
-    jest-matcher-utils "^27.5.1"
-    jest-message-util "^27.5.1"
-    jest-runtime "^27.5.1"
-    jest-snapshot "^27.5.1"
-    jest-util "^27.5.1"
-    pretty-format "^27.5.1"
+    jest-each "^29.3.1"
+    jest-matcher-utils "^29.3.1"
+    jest-message-util "^29.3.1"
+    jest-runtime "^29.3.1"
+    jest-snapshot "^29.3.1"
+    jest-util "^29.3.1"
+    p-limit "^3.1.0"
+    pretty-format "^29.3.1"
     slash "^3.0.0"
     stack-utils "^2.0.3"
-    throat "^6.0.1"
 
-jest-cli@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-27.5.1.tgz#278794a6e6458ea8029547e6c6cbf673bd30b145"
-  integrity sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==
+jest-cli@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-29.3.1.tgz#e89dff427db3b1df50cea9a393ebd8640790416d"
+  integrity sha512-TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ==
   dependencies:
-    "@jest/core" "^27.5.1"
-    "@jest/test-result" "^27.5.1"
-    "@jest/types" "^27.5.1"
+    "@jest/core" "^29.3.1"
+    "@jest/test-result" "^29.3.1"
+    "@jest/types" "^29.3.1"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.9"
     import-local "^3.0.2"
-    jest-config "^27.5.1"
-    jest-util "^27.5.1"
-    jest-validate "^27.5.1"
+    jest-config "^29.3.1"
+    jest-util "^29.3.1"
+    jest-validate "^29.3.1"
     prompts "^2.0.1"
-    yargs "^16.2.0"
+    yargs "^17.3.1"
 
-jest-config@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-27.5.1.tgz#5c387de33dca3f99ad6357ddeccd91bf3a0e4a41"
-  integrity sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==
+jest-config@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-29.3.1.tgz#0bc3dcb0959ff8662957f1259947aedaefb7f3c6"
+  integrity sha512-y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg==
   dependencies:
-    "@babel/core" "^7.8.0"
-    "@jest/test-sequencer" "^27.5.1"
-    "@jest/types" "^27.5.1"
-    babel-jest "^27.5.1"
+    "@babel/core" "^7.11.6"
+    "@jest/test-sequencer" "^29.3.1"
+    "@jest/types" "^29.3.1"
+    babel-jest "^29.3.1"
     chalk "^4.0.0"
     ci-info "^3.2.0"
     deepmerge "^4.2.2"
-    glob "^7.1.1"
+    glob "^7.1.3"
     graceful-fs "^4.2.9"
-    jest-circus "^27.5.1"
-    jest-environment-jsdom "^27.5.1"
-    jest-environment-node "^27.5.1"
-    jest-get-type "^27.5.1"
-    jest-jasmine2 "^27.5.1"
-    jest-regex-util "^27.5.1"
-    jest-resolve "^27.5.1"
-    jest-runner "^27.5.1"
-    jest-util "^27.5.1"
-    jest-validate "^27.5.1"
+    jest-circus "^29.3.1"
+    jest-environment-node "^29.3.1"
+    jest-get-type "^29.2.0"
+    jest-regex-util "^29.2.0"
+    jest-resolve "^29.3.1"
+    jest-runner "^29.3.1"
+    jest-util "^29.3.1"
+    jest-validate "^29.3.1"
     micromatch "^4.0.4"
     parse-json "^5.2.0"
-    pretty-format "^27.5.1"
+    pretty-format "^29.3.1"
     slash "^3.0.0"
     strip-json-comments "^3.1.1"
 
-jest-diff@^27.0.1, jest-diff@^27.5.1:
+jest-diff@^27.0.1:
   version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-27.5.1.tgz#a07f5011ac9e6643cf8a95a462b7b1ecf6680def"
+  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.1.tgz"
   integrity sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==
   dependencies:
     chalk "^4.0.0"
@@ -6344,7 +6916,7 @@ jest-diff@^27.0.1, jest-diff@^27.5.1:
 
 jest-diff@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-28.1.3.tgz#948a192d86f4e7a64c5264ad4da4877133d8792f"
+  resolved "https://registry.npmjs.org/jest-diff/-/jest-diff-28.1.3.tgz"
   integrity sha512-8RqP1B/OXzjjTWkqMX67iqgwBVJRgCyKD3L9nq+6ZqJMdvjE8RgHktqZ6jNrkdMT+dJuYNI3rhQpxaz7drJHfw==
   dependencies:
     chalk "^4.0.0"
@@ -6352,150 +6924,113 @@ jest-diff@^28.1.3:
     jest-get-type "^28.0.2"
     pretty-format "^28.1.3"
 
-jest-docblock@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-27.5.1.tgz#14092f364a42c6108d42c33c8cf30e058e25f6c0"
-  integrity sha512-rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ==
+jest-diff@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-29.3.1.tgz#d8215b72fed8f1e647aed2cae6c752a89e757527"
+  integrity sha512-vU8vyiO7568tmin2lA3r2DP8oRvzhvRcD4DjpXc6uGveQodyk7CKLhQlCSiwgx3g0pFaE88/KLZ0yaTWMc4Uiw==
+  dependencies:
+    chalk "^4.0.0"
+    diff-sequences "^29.3.1"
+    jest-get-type "^29.2.0"
+    pretty-format "^29.3.1"
+
+jest-docblock@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-29.2.0.tgz#307203e20b637d97cee04809efc1d43afc641e82"
+  integrity sha512-bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A==
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-27.5.1.tgz#5bc87016f45ed9507fed6e4702a5b468a5b2c44e"
-  integrity sha512-1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ==
+jest-each@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.3.1.tgz#bc375c8734f1bb96625d83d1ca03ef508379e132"
+  integrity sha512-qrZH7PmFB9rEzCSl00BWjZYuS1BSOH8lLuC0azQE9lQrAx3PWGKHTDudQiOSwIy5dGAJh7KA0ScYlCP7JxvFYA==
   dependencies:
-    "@jest/types" "^27.5.1"
+    "@jest/types" "^29.3.1"
     chalk "^4.0.0"
-    jest-get-type "^27.5.1"
-    jest-util "^27.5.1"
-    pretty-format "^27.5.1"
+    jest-get-type "^29.2.0"
+    jest-util "^29.3.1"
+    pretty-format "^29.3.1"
 
-jest-environment-jsdom@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-27.5.1.tgz#ea9ccd1fc610209655a77898f86b2b559516a546"
-  integrity sha512-TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw==
+jest-environment-jsdom@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-29.3.1.tgz#14ca63c3e0ef5c63c5bcb46033e50bc649e3b639"
+  integrity sha512-G46nKgiez2Gy4zvYNhayfMEAFlVHhWfncqvqS6yCd0i+a4NsSUD2WtrKSaYQrYiLQaupHXxCRi8xxVL2M9PbhA==
   dependencies:
-    "@jest/environment" "^27.5.1"
-    "@jest/fake-timers" "^27.5.1"
-    "@jest/types" "^27.5.1"
+    "@jest/environment" "^29.3.1"
+    "@jest/fake-timers" "^29.3.1"
+    "@jest/types" "^29.3.1"
+    "@types/jsdom" "^20.0.0"
     "@types/node" "*"
-    jest-mock "^27.5.1"
-    jest-util "^27.5.1"
-    jsdom "^16.6.0"
+    jest-mock "^29.3.1"
+    jest-util "^29.3.1"
+    jsdom "^20.0.0"
 
-jest-environment-node@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-27.5.1.tgz#dedc2cfe52fab6b8f5714b4808aefa85357a365e"
-  integrity sha512-Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw==
+jest-environment-node@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-29.3.1.tgz#5023b32472b3fba91db5c799a0d5624ad4803e74"
+  integrity sha512-xm2THL18Xf5sIHoU7OThBPtuH6Lerd+Y1NLYiZJlkE3hbE+7N7r8uvHIl/FkZ5ymKXJe/11SQuf3fv4v6rUMag==
   dependencies:
-    "@jest/environment" "^27.5.1"
-    "@jest/fake-timers" "^27.5.1"
-    "@jest/types" "^27.5.1"
+    "@jest/environment" "^29.3.1"
+    "@jest/fake-timers" "^29.3.1"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
-    jest-mock "^27.5.1"
-    jest-util "^27.5.1"
+    jest-mock "^29.3.1"
+    jest-util "^29.3.1"
 
 jest-get-type@^27.5.1:
   version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-27.5.1.tgz#3cd613c507b0f7ace013df407a1c1cd578bcb4f1"
+  resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.1.tgz"
   integrity sha512-2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw==
 
 jest-get-type@^28.0.2:
   version "28.0.2"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-28.0.2.tgz#34622e628e4fdcd793d46db8a242227901fcf203"
+  resolved "https://registry.npmjs.org/jest-get-type/-/jest-get-type-28.0.2.tgz"
   integrity sha512-ioj2w9/DxSYHfOm5lJKCdcAmPJzQXmbM/Url3rhlghrPvT3tt+7a/+oXc9azkKmLvoiXjtV83bEWqi+vs5nlPA==
 
-jest-haste-map@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-27.5.1.tgz#9fd8bd7e7b4fa502d9c6164c5640512b4e811e7f"
-  integrity sha512-7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng==
-  dependencies:
-    "@jest/types" "^27.5.1"
-    "@types/graceful-fs" "^4.1.2"
-    "@types/node" "*"
-    anymatch "^3.0.3"
-    fb-watchman "^2.0.0"
-    graceful-fs "^4.2.9"
-    jest-regex-util "^27.5.1"
-    jest-serializer "^27.5.1"
-    jest-util "^27.5.1"
-    jest-worker "^27.5.1"
-    micromatch "^4.0.4"
-    walker "^1.0.7"
-  optionalDependencies:
-    fsevents "^2.3.2"
+jest-get-type@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-29.2.0.tgz#726646f927ef61d583a3b3adb1ab13f3a5036408"
+  integrity sha512-uXNJlg8hKFEnDgFsrCjznB+sTxdkuqiCL6zMgA75qEbAJjJYTs9XPrvDctrEig2GDow22T/LvHgO57iJhXB/UA==
 
-jest-haste-map@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-28.1.3.tgz#abd5451129a38d9841049644f34b034308944e2b"
-  integrity sha512-3S+RQWDXccXDKSWnkHa/dPwt+2qwA8CJzR61w3FoYCvoo3Pn8tvGcysmMF0Bj0EX5RYvAI2EIvC57OmotfdtKA==
+jest-haste-map@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-29.3.1.tgz#af83b4347f1dae5ee8c2fb57368dc0bb3e5af843"
+  integrity sha512-/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A==
   dependencies:
-    "@jest/types" "^28.1.3"
+    "@jest/types" "^29.3.1"
     "@types/graceful-fs" "^4.1.3"
     "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
     graceful-fs "^4.2.9"
-    jest-regex-util "^28.0.2"
-    jest-util "^28.1.3"
-    jest-worker "^28.1.3"
+    jest-regex-util "^29.2.0"
+    jest-util "^29.3.1"
+    jest-worker "^29.3.1"
     micromatch "^4.0.4"
     walker "^1.0.8"
   optionalDependencies:
     fsevents "^2.3.2"
 
-jest-jasmine2@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-27.5.1.tgz#a037b0034ef49a9f3d71c4375a796f3b230d1ac4"
-  integrity sha512-jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ==
+jest-leak-detector@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-29.3.1.tgz#95336d020170671db0ee166b75cd8ef647265518"
+  integrity sha512-3DA/VVXj4zFOPagGkuqHnSQf1GZBmmlagpguxEERO6Pla2g84Q1MaVIB3YMxgUaFIaYag8ZnTyQgiZ35YEqAQA==
   dependencies:
-    "@jest/environment" "^27.5.1"
-    "@jest/source-map" "^27.5.1"
-    "@jest/test-result" "^27.5.1"
-    "@jest/types" "^27.5.1"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    co "^4.6.0"
-    expect "^27.5.1"
-    is-generator-fn "^2.0.0"
-    jest-each "^27.5.1"
-    jest-matcher-utils "^27.5.1"
-    jest-message-util "^27.5.1"
-    jest-runtime "^27.5.1"
-    jest-snapshot "^27.5.1"
-    jest-util "^27.5.1"
-    pretty-format "^27.5.1"
-    throat "^6.0.1"
-
-jest-leak-detector@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-27.5.1.tgz#6ec9d54c3579dd6e3e66d70e3498adf80fde3fb8"
-  integrity sha512-POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ==
-  dependencies:
-    jest-get-type "^27.5.1"
-    pretty-format "^27.5.1"
+    jest-get-type "^29.2.0"
+    pretty-format "^29.3.1"
 
 jest-location-mock@^1.0.9:
   version "1.0.9"
-  resolved "https://registry.yarnpkg.com/jest-location-mock/-/jest-location-mock-1.0.9.tgz#f4466362423b273e12ca3716467a3d478ce78fa8"
+  resolved "https://registry.npmjs.org/jest-location-mock/-/jest-location-mock-1.0.9.tgz"
   integrity sha512-DN/v7Zsa3N4uGgWTCrMrPPxhZORr/4N5gi+u7Tk6sLdORYplrC0//wfFN5FOtx4ZdQzDVfY6rLa4d+wfTKzQHw==
   dependencies:
     "@jedmao/location" "^3.0.0"
     jest-diff "^27.0.1"
 
-jest-matcher-utils@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-27.5.1.tgz#9c0cdbda8245bc22d2331729d1091308b40cf8ab"
-  integrity sha512-z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw==
-  dependencies:
-    chalk "^4.0.0"
-    jest-diff "^27.5.1"
-    jest-get-type "^27.5.1"
-    pretty-format "^27.5.1"
-
 jest-matcher-utils@^28.0.0:
   version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz#5a77f1c129dd5ba3b4d7fc20728806c78893146e"
+  resolved "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-28.1.3.tgz"
   integrity sha512-kQeJ7qHemKfbzKoGjHHrRKH6atgxMk8Enkk2iPQ3XwO6oE/KYD8lMYOziCkeSB9G4adPM4nR1DE8Tf5JeWH6Bw==
   dependencies:
     chalk "^4.0.0"
@@ -6503,190 +7038,159 @@ jest-matcher-utils@^28.0.0:
     jest-get-type "^28.0.2"
     pretty-format "^28.1.3"
 
-jest-message-util@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-27.5.1.tgz#bdda72806da10d9ed6425e12afff38cd1458b6cf"
-  integrity sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==
+jest-matcher-utils@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-29.3.1.tgz#6e7f53512f80e817dfa148672bd2d5d04914a572"
+  integrity sha512-fkRMZUAScup3txIKfMe3AIZZmPEjWEdsPJFK3AIy5qRohWqQFg1qrmKfYXR9qEkNc7OdAu2N4KPHibEmy4HPeQ==
+  dependencies:
+    chalk "^4.0.0"
+    jest-diff "^29.3.1"
+    jest-get-type "^29.2.0"
+    pretty-format "^29.3.1"
+
+jest-message-util@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-29.3.1.tgz#37bc5c468dfe5120712053dd03faf0f053bd6adb"
+  integrity sha512-lMJTbgNcDm5z+6KDxWtqOFWlGQxD6XaYwBqHR8kmpkP+WWWG90I35kdtQHY67Ay5CSuydkTBbJG+tH9JShFCyA==
   dependencies:
     "@babel/code-frame" "^7.12.13"
-    "@jest/types" "^27.5.1"
+    "@jest/types" "^29.3.1"
     "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
     micromatch "^4.0.4"
-    pretty-format "^27.5.1"
+    pretty-format "^29.3.1"
     slash "^3.0.0"
     stack-utils "^2.0.3"
 
-jest-mock@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-27.5.1.tgz#19948336d49ef4d9c52021d34ac7b5f36ff967d6"
-  integrity sha512-K4jKbY1d4ENhbrG2zuPWaQBvDly+iZ2yAW+T1fATN78hc0sInwn7wZB8XtlNnvHug5RMwV897Xm4LqmPM4e2Og==
+jest-mock@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-29.3.1.tgz#60287d92e5010979d01f218c6b215b688e0f313e"
+  integrity sha512-H8/qFDtDVMFvFP4X8NuOT3XRDzOUTz+FeACjufHzsOIBAxivLqkB1PoLCaJx9iPPQ8dZThHPp/G3WRWyMgA3JA==
   dependencies:
-    "@jest/types" "^27.5.1"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
+    jest-util "^29.3.1"
 
 jest-pnp-resolver@^1.2.2:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
+  resolved "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz"
   integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
-jest-raw-loader@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/jest-raw-loader/-/jest-raw-loader-1.0.1.tgz#ce9f56d54650f157c4a7d16d224ba5d613bcd626"
-  integrity sha512-g9oaAjeC4/rIJk1Wd3RxVbOfMizowM7LSjEJqa4R9qDX0OjQNABXOhH+GaznUp+DjTGVPi2vPPbQXyX87DOnYg==
+jest-regex-util@^29.2.0:
+  version "29.2.0"
+  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-29.2.0.tgz#82ef3b587e8c303357728d0322d48bbfd2971f7b"
+  integrity sha512-6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA==
 
-jest-regex-util@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-27.5.1.tgz#4da143f7e9fd1e542d4aa69617b38e4a78365b95"
-  integrity sha512-4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg==
-
-jest-regex-util@^28.0.2:
-  version "28.0.2"
-  resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-28.0.2.tgz#afdc377a3b25fb6e80825adcf76c854e5bf47ead"
-  integrity sha512-4s0IgyNIy0y9FK+cjoVYoxamT7Zeo7MhzqRGx7YDYmaQn1wucY9rotiGkBzzcMXTtjrCAP/f7f+E0F7+fxPNdw==
-
-jest-resolve-dependencies@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.1.tgz#d811ecc8305e731cc86dd79741ee98fed06f1da8"
-  integrity sha512-QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg==
+jest-resolve-dependencies@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-29.3.1.tgz#a6a329708a128e68d67c49f38678a4a4a914c3bf"
+  integrity sha512-Vk0cYq0byRw2WluNmNWGqPeRnZ3p3hHmjJMp2dyyZeYIfiBskwq4rpiuGFR6QGAdbj58WC7HN4hQHjf2mpvrLA==
   dependencies:
-    "@jest/types" "^27.5.1"
-    jest-regex-util "^27.5.1"
-    jest-snapshot "^27.5.1"
+    jest-regex-util "^29.2.0"
+    jest-snapshot "^29.3.1"
 
-jest-resolve@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-27.5.1.tgz#a2f1c5a0796ec18fe9eb1536ac3814c23617b384"
-  integrity sha512-FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw==
+jest-resolve@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-29.3.1.tgz#9a4b6b65387a3141e4a40815535c7f196f1a68a7"
+  integrity sha512-amXJgH/Ng712w3Uz5gqzFBBjxV8WFLSmNjoreBGMqxgCz5cH7swmBZzgBaCIOsvb0NbpJ0vgaSFdJqMdT+rADw==
   dependencies:
-    "@jest/types" "^27.5.1"
     chalk "^4.0.0"
     graceful-fs "^4.2.9"
-    jest-haste-map "^27.5.1"
+    jest-haste-map "^29.3.1"
     jest-pnp-resolver "^1.2.2"
-    jest-util "^27.5.1"
-    jest-validate "^27.5.1"
+    jest-util "^29.3.1"
+    jest-validate "^29.3.1"
     resolve "^1.20.0"
     resolve.exports "^1.1.0"
     slash "^3.0.0"
 
-jest-runner@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-27.5.1.tgz#071b27c1fa30d90540805c5645a0ec167c7b62e5"
-  integrity sha512-g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ==
+jest-runner@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-29.3.1.tgz#a92a879a47dd096fea46bb1517b0a99418ee9e2d"
+  integrity sha512-oFvcwRNrKMtE6u9+AQPMATxFcTySyKfLhvso7Sdk/rNpbhg4g2GAGCopiInk1OP4q6gz3n6MajW4+fnHWlU3bA==
   dependencies:
-    "@jest/console" "^27.5.1"
-    "@jest/environment" "^27.5.1"
-    "@jest/test-result" "^27.5.1"
-    "@jest/transform" "^27.5.1"
-    "@jest/types" "^27.5.1"
+    "@jest/console" "^29.3.1"
+    "@jest/environment" "^29.3.1"
+    "@jest/test-result" "^29.3.1"
+    "@jest/transform" "^29.3.1"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
     chalk "^4.0.0"
-    emittery "^0.8.1"
+    emittery "^0.13.1"
     graceful-fs "^4.2.9"
-    jest-docblock "^27.5.1"
-    jest-environment-jsdom "^27.5.1"
-    jest-environment-node "^27.5.1"
-    jest-haste-map "^27.5.1"
-    jest-leak-detector "^27.5.1"
-    jest-message-util "^27.5.1"
-    jest-resolve "^27.5.1"
-    jest-runtime "^27.5.1"
-    jest-util "^27.5.1"
-    jest-worker "^27.5.1"
-    source-map-support "^0.5.6"
-    throat "^6.0.1"
+    jest-docblock "^29.2.0"
+    jest-environment-node "^29.3.1"
+    jest-haste-map "^29.3.1"
+    jest-leak-detector "^29.3.1"
+    jest-message-util "^29.3.1"
+    jest-resolve "^29.3.1"
+    jest-runtime "^29.3.1"
+    jest-util "^29.3.1"
+    jest-watcher "^29.3.1"
+    jest-worker "^29.3.1"
+    p-limit "^3.1.0"
+    source-map-support "0.5.13"
 
-jest-runtime@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-27.5.1.tgz#4896003d7a334f7e8e4a53ba93fb9bcd3db0a1af"
-  integrity sha512-o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A==
+jest-runtime@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-29.3.1.tgz#21efccb1a66911d6d8591276a6182f520b86737a"
+  integrity sha512-jLzkIxIqXwBEOZx7wx9OO9sxoZmgT2NhmQKzHQm1xwR1kNW/dn0OjxR424VwHHf1SPN6Qwlb5pp1oGCeFTQ62A==
   dependencies:
-    "@jest/environment" "^27.5.1"
-    "@jest/fake-timers" "^27.5.1"
-    "@jest/globals" "^27.5.1"
-    "@jest/source-map" "^27.5.1"
-    "@jest/test-result" "^27.5.1"
-    "@jest/transform" "^27.5.1"
-    "@jest/types" "^27.5.1"
+    "@jest/environment" "^29.3.1"
+    "@jest/fake-timers" "^29.3.1"
+    "@jest/globals" "^29.3.1"
+    "@jest/source-map" "^29.2.0"
+    "@jest/test-result" "^29.3.1"
+    "@jest/transform" "^29.3.1"
+    "@jest/types" "^29.3.1"
+    "@types/node" "*"
     chalk "^4.0.0"
     cjs-module-lexer "^1.0.0"
     collect-v8-coverage "^1.0.0"
-    execa "^5.0.0"
     glob "^7.1.3"
     graceful-fs "^4.2.9"
-    jest-haste-map "^27.5.1"
-    jest-message-util "^27.5.1"
-    jest-mock "^27.5.1"
-    jest-regex-util "^27.5.1"
-    jest-resolve "^27.5.1"
-    jest-snapshot "^27.5.1"
-    jest-util "^27.5.1"
+    jest-haste-map "^29.3.1"
+    jest-message-util "^29.3.1"
+    jest-mock "^29.3.1"
+    jest-regex-util "^29.2.0"
+    jest-resolve "^29.3.1"
+    jest-snapshot "^29.3.1"
+    jest-util "^29.3.1"
     slash "^3.0.0"
     strip-bom "^4.0.0"
 
-jest-serializer@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-27.5.1.tgz#81438410a30ea66fd57ff730835123dea1fb1f64"
-  integrity sha512-jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w==
+jest-snapshot@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-29.3.1.tgz#17bcef71a453adc059a18a32ccbd594b8cc4e45e"
+  integrity sha512-+3JOc+s28upYLI2OJM4PWRGK9AgpsMs/ekNryUV0yMBClT9B1DF2u2qay8YxcQd338PPYSFNb0lsar1B49sLDA==
   dependencies:
-    "@types/node" "*"
-    graceful-fs "^4.2.9"
-
-jest-snapshot@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-27.5.1.tgz#b668d50d23d38054a51b42c4039cab59ae6eb6a1"
-  integrity sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==
-  dependencies:
-    "@babel/core" "^7.7.2"
+    "@babel/core" "^7.11.6"
     "@babel/generator" "^7.7.2"
+    "@babel/plugin-syntax-jsx" "^7.7.2"
     "@babel/plugin-syntax-typescript" "^7.7.2"
     "@babel/traverse" "^7.7.2"
-    "@babel/types" "^7.0.0"
-    "@jest/transform" "^27.5.1"
-    "@jest/types" "^27.5.1"
-    "@types/babel__traverse" "^7.0.4"
+    "@babel/types" "^7.3.3"
+    "@jest/expect-utils" "^29.3.1"
+    "@jest/transform" "^29.3.1"
+    "@jest/types" "^29.3.1"
+    "@types/babel__traverse" "^7.0.6"
     "@types/prettier" "^2.1.5"
     babel-preset-current-node-syntax "^1.0.0"
     chalk "^4.0.0"
-    expect "^27.5.1"
+    expect "^29.3.1"
     graceful-fs "^4.2.9"
-    jest-diff "^27.5.1"
-    jest-get-type "^27.5.1"
-    jest-haste-map "^27.5.1"
-    jest-matcher-utils "^27.5.1"
-    jest-message-util "^27.5.1"
-    jest-util "^27.5.1"
+    jest-diff "^29.3.1"
+    jest-get-type "^29.2.0"
+    jest-haste-map "^29.3.1"
+    jest-matcher-utils "^29.3.1"
+    jest-message-util "^29.3.1"
+    jest-util "^29.3.1"
     natural-compare "^1.4.0"
-    pretty-format "^27.5.1"
-    semver "^7.3.2"
+    pretty-format "^29.3.1"
+    semver "^7.3.5"
 
-jest-util@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-27.5.1.tgz#3ba9771e8e31a0b85da48fe0b0891fb86c01c2f9"
-  integrity sha512-Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw==
-  dependencies:
-    "@jest/types" "^27.5.1"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    graceful-fs "^4.2.9"
-    picomatch "^2.2.3"
-
-jest-util@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-28.1.3.tgz#f4f932aa0074f0679943220ff9cbba7e497028b0"
-  integrity sha512-XdqfpHwpcSRko/C35uLYFM2emRAltIIKZiJ9eAmhjsj0CqZMa0p1ib0R5fWIqGhn1a103DebTbpqIaP1qCQ6tQ==
-  dependencies:
-    "@jest/types" "^28.1.3"
-    "@types/node" "*"
-    chalk "^4.0.0"
-    ci-info "^3.2.0"
-    graceful-fs "^4.2.9"
-    picomatch "^2.2.3"
-
-jest-util@^29.0.0:
+jest-util@^29.0.0, jest-util@^29.3.1:
   version "29.3.1"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-29.3.1.tgz#1dda51e378bbcb7e3bc9d8ab651445591ed373e1"
   integrity sha512-7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ==
@@ -6698,93 +7202,96 @@ jest-util@^29.0.0:
     graceful-fs "^4.2.9"
     picomatch "^2.2.3"
 
-jest-validate@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-27.5.1.tgz#9197d54dc0bdb52260b8db40b46ae668e04df067"
-  integrity sha512-thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ==
+jest-validate@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-29.3.1.tgz#d56fefaa2e7d1fde3ecdc973c7f7f8f25eea704a"
+  integrity sha512-N9Lr3oYR2Mpzuelp1F8negJR3YE+L1ebk1rYA5qYo9TTY3f9OWdptLoNSPP9itOCBIRBqjt/S5XHlzYglLN67g==
   dependencies:
-    "@jest/types" "^27.5.1"
+    "@jest/types" "^29.3.1"
     camelcase "^6.2.0"
     chalk "^4.0.0"
-    jest-get-type "^27.5.1"
+    jest-get-type "^29.2.0"
     leven "^3.1.0"
-    pretty-format "^27.5.1"
+    pretty-format "^29.3.1"
 
-jest-watcher@^27.5.1:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-27.5.1.tgz#71bd85fb9bde3a2c2ec4dc353437971c43c642a2"
-  integrity sha512-z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw==
+jest-watcher@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-29.3.1.tgz#3341547e14fe3c0f79f9c3a4c62dbc3fc977fd4a"
+  integrity sha512-RspXG2BQFDsZSRKGCT/NiNa8RkQ1iKAjrO0//soTMWx/QUt+OcxMqMSBxz23PYGqUuWm2+m2mNNsmj0eIoOaFg==
   dependencies:
-    "@jest/test-result" "^27.5.1"
-    "@jest/types" "^27.5.1"
+    "@jest/test-result" "^29.3.1"
+    "@jest/types" "^29.3.1"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    jest-util "^27.5.1"
+    emittery "^0.13.1"
+    jest-util "^29.3.1"
     string-length "^4.0.1"
 
 jest-worker@^27.4.5, jest-worker@^27.5.1:
   version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
+  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz"
   integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest-worker@^28.1.3:
-  version "28.1.3"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-28.1.3.tgz#7e3c4ce3fa23d1bb6accb169e7f396f98ed4bb98"
-  integrity sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==
+jest-worker@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-29.3.1.tgz#e9462161017a9bb176380d721cab022661da3d6b"
+  integrity sha512-lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw==
   dependencies:
     "@types/node" "*"
+    jest-util "^29.3.1"
     merge-stream "^2.0.0"
     supports-color "^8.0.0"
 
-jest@^27.4.7:
-  version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-27.5.1.tgz#dadf33ba70a779be7a6fc33015843b51494f63fc"
-  integrity sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==
+jest@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-29.3.1.tgz#c130c0d551ae6b5459b8963747fed392ddbde122"
+  integrity sha512-6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA==
   dependencies:
-    "@jest/core" "^27.5.1"
+    "@jest/core" "^29.3.1"
+    "@jest/types" "^29.3.1"
     import-local "^3.0.2"
-    jest-cli "^27.5.1"
+    jest-cli "^29.3.1"
 
 jquery-migrate@~1.4:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jquery-migrate/-/jquery-migrate-1.4.1.tgz#85152f3ec99a95625f4f7d0bcf62e9b8638f5a76"
+  resolved "https://registry.npmjs.org/jquery-migrate/-/jquery-migrate-1.4.1.tgz"
   integrity sha512-RwIqqAaEC1gQ9KFtdw69wse2bUGQnGNwbkZBkCwSCYkAICMlpVxAbHmfvWaS7SfLGJrYd13FZTuuQgZ6gBotJQ==
 
 jquery-mousewheel@^3.1.13:
   version "3.1.13"
-  resolved "https://registry.yarnpkg.com/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz#06f0335f16e353a695e7206bf50503cb523a6ee5"
+  resolved "https://registry.npmjs.org/jquery-mousewheel/-/jquery-mousewheel-3.1.13.tgz"
   integrity sha512-GXhSjfOPyDemM005YCEHvzrEALhKDIswtxSHSR2e4K/suHVJKJxxRCGz3skPjNxjJjQa9AVSGGlYjv1M3VLIPg==
 
 jquery-ui@^1.13.2:
   version "1.13.2"
-  resolved "https://registry.yarnpkg.com/jquery-ui/-/jquery-ui-1.13.2.tgz#de03580ae6604773602f8d786ad1abfb75232034"
+  resolved "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.2.tgz"
   integrity sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q==
   dependencies:
     jquery ">=1.8.0 <4.0.0"
 
 jquery@2:
   version "2.2.4"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02"
+  resolved "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz"
   integrity sha512-lBHj60ezci2u1v2FqnZIraShGgEXq35qCzMv4lITyHGppTnA13rwR0MgwyNJh9TnDs3aXUvd1xjAotfraMHX/Q==
 
 jquery@>=1.12.0, "jquery@>=1.8.0 <4.0.0":
   version "3.6.0"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
+  resolved "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz"
   integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
 
 js-base64@^2.6.1:
   version "2.6.4"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4"
+  resolved "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz"
   integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==
 
 js-beautify@^1.6.12:
   version "1.14.5"
-  resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.5.tgz#d544e3ac94371af3a4eadec0dea9fc1cd15743b9"
+  resolved "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.5.tgz"
   integrity sha512-P2BfZBhXchh10uZ87qMKpM2tfcDXLA+jDiWU/OV864yWdTGzLUGNAdp9Y1ID5ubpNVGls3cZ1UMcO8myUB+UyA==
   dependencies:
     config-chain "^1.1.13"
@@ -6793,18 +7300,18 @@ js-beautify@^1.6.12:
     nopt "^6.0.0"
 
 js-sdsl@^4.1.4:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.5.tgz#1ff1645e6b4d1b028cd3f862db88c9d887f26e2a"
-  integrity sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.2.0.tgz#278e98b7bea589b8baaf048c20aeb19eb7ad09d0"
+  integrity sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==
 
 js-tokens@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^3.13.1:
   version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
@@ -6812,101 +7319,100 @@ js-yaml@^3.13.1:
 
 js-yaml@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"
   integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
   dependencies:
     argparse "^2.0.1"
 
-jsdom@^16.6.0:
-  version "16.7.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
-  integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==
+jsdom@^20.0.0:
+  version "20.0.3"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-20.0.3.tgz#886a41ba1d4726f67a8858028c99489fed6ad4db"
+  integrity sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==
   dependencies:
-    abab "^2.0.5"
-    acorn "^8.2.4"
-    acorn-globals "^6.0.0"
-    cssom "^0.4.4"
+    abab "^2.0.6"
+    acorn "^8.8.1"
+    acorn-globals "^7.0.0"
+    cssom "^0.5.0"
     cssstyle "^2.3.0"
-    data-urls "^2.0.0"
-    decimal.js "^10.2.1"
-    domexception "^2.0.1"
+    data-urls "^3.0.2"
+    decimal.js "^10.4.2"
+    domexception "^4.0.0"
     escodegen "^2.0.0"
-    form-data "^3.0.0"
-    html-encoding-sniffer "^2.0.1"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
+    form-data "^4.0.0"
+    html-encoding-sniffer "^3.0.0"
+    http-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.1"
     is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.0"
-    parse5 "6.0.1"
-    saxes "^5.0.1"
+    nwsapi "^2.2.2"
+    parse5 "^7.1.1"
+    saxes "^6.0.0"
     symbol-tree "^3.2.4"
-    tough-cookie "^4.0.0"
-    w3c-hr-time "^1.0.2"
-    w3c-xmlserializer "^2.0.0"
-    webidl-conversions "^6.1.0"
-    whatwg-encoding "^1.0.5"
-    whatwg-mimetype "^2.3.0"
-    whatwg-url "^8.5.0"
-    ws "^7.4.6"
-    xml-name-validator "^3.0.0"
+    tough-cookie "^4.1.2"
+    w3c-xmlserializer "^4.0.0"
+    webidl-conversions "^7.0.0"
+    whatwg-encoding "^2.0.0"
+    whatwg-mimetype "^3.0.0"
+    whatwg-url "^11.0.0"
+    ws "^8.11.0"
+    xml-name-validator "^4.0.0"
 
 jsesc@^2.5.1:
   version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
 jsesc@~0.5.0:
   version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
+  resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
   integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
 json-loader@^0.5.7:
   version "0.5.7"
-  resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
+  resolved "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz"
   integrity sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==
 
 json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema-traverse@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 json5@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  resolved "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz"
   integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
   dependencies:
     minimist "^1.2.0"
 
 json5@^2.1.2, json5@^2.2.1:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c"
+  resolved "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"
   integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==
 
 jsonfile@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"
   integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jspdf@^2.5.1:
   version "2.5.1"
-  resolved "https://registry.yarnpkg.com/jspdf/-/jspdf-2.5.1.tgz#00c85250abf5447a05f3b32ab9935ab4a56592cc"
+  resolved "https://registry.npmjs.org/jspdf/-/jspdf-2.5.1.tgz"
   integrity sha512-hXObxz7ZqoyhxET78+XR34Xu2qFGrJJ2I2bE5w4SM8eFaFEkW2xcGRVUss360fYelwRSid/jT078kbNvmoW0QA==
   dependencies:
     "@babel/runtime" "^7.14.0"
@@ -6921,34 +7427,34 @@ jspdf@^2.5.1:
 
 just-debounce@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/just-debounce/-/just-debounce-1.1.0.tgz#2f81a3ad4121a76bc7cb45dbf704c0d76a8e5ddf"
+  resolved "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz"
   integrity sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==
 
 just-extend@^4.0.2:
   version "4.2.1"
-  resolved "https://registry.yarnpkg.com/just-extend/-/just-extend-4.2.1.tgz#ef5e589afb61e5d66b24eca749409a8939a8c744"
+  resolved "https://registry.npmjs.org/just-extend/-/just-extend-4.2.1.tgz"
   integrity sha512-g3UB796vUFIY90VIv/WX3L2c8CS2MdWUww3CNrYmqza1Fg0DURc2K/O4YrnklBdQarSJ/y8JnJYDGc+1iumQjg==
 
 karma-chrome-launcher@^3.1.0:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.1.1.tgz#baca9cc071b1562a1db241827257bfe5cab597ea"
+  resolved "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-3.1.1.tgz"
   integrity sha512-hsIglcq1vtboGPAN+DGCISCFOxW+ZVnIqhDQcCMqqCp+4dmJ0Qpq5QAjkbA0X2L9Mi6OBkHi2Srrbmm7pUKkzQ==
   dependencies:
     which "^1.2.1"
 
 karma-polyfill@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/karma-polyfill/-/karma-polyfill-1.1.0.tgz#e729a06ab6b0d3b5a82ecc044196d1e1d0fdf533"
+  resolved "https://registry.npmjs.org/karma-polyfill/-/karma-polyfill-1.1.0.tgz"
   integrity sha512-TGWOIeTa4VBU2Af6jp4IYbROlTH6EXqpQZt15r0TRv7AYMt03BIagj5eljZgC64Uqg11QDh09j9megr6Vmzm6g==
 
 karma-qunit@^4.1.2:
   version "4.1.2"
-  resolved "https://registry.yarnpkg.com/karma-qunit/-/karma-qunit-4.1.2.tgz#fa27697470e749fb4bd63b1b5e487b6165ec9ec8"
+  resolved "https://registry.npmjs.org/karma-qunit/-/karma-qunit-4.1.2.tgz"
   integrity sha512-taTPqBeHCOlkeKTSzQgIKzAUb79vw3rfbCph+xwwh63tyGjNtljwx91VArhIM9DzIIR3gB9G214wQg+oXI9ycw==
 
 karma-webpack@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-5.0.0.tgz#2a2c7b80163fe7ffd1010f83f5507f95ef39f840"
+  resolved "https://registry.npmjs.org/karma-webpack/-/karma-webpack-5.0.0.tgz"
   integrity sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA==
   dependencies:
     glob "^7.1.3"
@@ -6957,7 +7463,7 @@ karma-webpack@^5.0.0:
 
 karma@^6.3.16:
   version "6.4.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.0.tgz#82652dfecdd853ec227b74ed718a997028a99508"
+  resolved "https://registry.npmjs.org/karma/-/karma-6.4.0.tgz"
   integrity sha512-s8m7z0IF5g/bS5ONT7wsOavhW4i4aFkzD4u4wgzAQWT4HGUeWI3i21cK2Yz6jndMAeHETp5XuNsRoyGJZXVd4w==
   dependencies:
     "@colors/colors" "1.5.0"
@@ -6987,41 +7493,41 @@ karma@^6.3.16:
 
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  resolved "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"
   integrity sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  resolved "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"
   integrity sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==
   dependencies:
     is-buffer "^1.1.5"
 
 kind-of@^5.0.0, kind-of@^5.0.2:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  resolved "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"
   integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
 
 kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
 kleur@^3.0.3:
   version "3.0.3"
-  resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+  resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
 klona@^2.0.4, klona@^2.0.5:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
+  resolved "https://registry.npmjs.org/klona/-/klona-2.0.5.tgz"
   integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
 
 last-run@^1.1.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/last-run/-/last-run-1.1.1.tgz#45b96942c17b1c79c772198259ba943bebf8ca5b"
+  resolved "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz"
   integrity sha512-U/VxvpX4N/rFvPzr3qG5EtLKEnNI0emvIQB3/ecEwv+8GHaUKbIB8vxv1Oai5FAF0d0r7LXHhLLe5K/yChm5GQ==
   dependencies:
     default-resolution "^2.0.0"
@@ -7029,33 +7535,33 @@ last-run@^1.1.0:
 
 lazystream@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638"
+  resolved "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz"
   integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==
   dependencies:
     readable-stream "^2.0.5"
 
 lcid@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
+  resolved "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"
   integrity sha512-YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==
   dependencies:
     invert-kv "^1.0.0"
 
 lead@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42"
+  resolved "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz"
   integrity sha512-IpSVCk9AYvLHo5ctcIXxOBpMWUe+4TKN3VPWAKUbJikkmsGp0VrSM8IttVc32D6J4WUsiPE6aEFRNmIoF/gdow==
   dependencies:
     flush-write-stream "^1.0.2"
 
 leven@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
+  resolved "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
 levn@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"
   integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
   dependencies:
     prelude-ls "^1.2.1"
@@ -7063,7 +7569,7 @@ levn@^0.4.1:
 
 levn@~0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  resolved "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"
   integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
   dependencies:
     prelude-ls "~1.1.2"
@@ -7071,14 +7577,14 @@ levn@~0.3.0:
 
 lie@3.1.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
+  resolved "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz"
   integrity sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==
   dependencies:
     immediate "~3.0.5"
 
 liftoff@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-3.1.0.tgz#c9ba6081f908670607ee79062d700df062c52ed3"
+  resolved "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz"
   integrity sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==
   dependencies:
     extend "^3.0.0"
@@ -7092,34 +7598,34 @@ liftoff@^3.1.0:
 
 lilconfig@^2.0.3:
   version "2.0.6"
-  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.6.tgz#32a384558bd58af3d4c6e077dd1ad1d397bc69d4"
+  resolved "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.6.tgz"
   integrity sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==
 
 lines-and-columns@^1.1.6:
   version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+  resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
 linkify-html@^3.0.5:
   version "3.0.5"
-  resolved "https://registry.yarnpkg.com/linkify-html/-/linkify-html-3.0.5.tgz#317181f7603e17b7d38492b0f6fdf9cce14f1e6b"
+  resolved "https://registry.npmjs.org/linkify-html/-/linkify-html-3.0.5.tgz"
   integrity sha512-3O7HEYjkugX+C/G2C2wyBmIt8Mt0pmeaHNIxRHodCFeQQeSxSoZHR+5hC1pi0WrmoEvfnSemyZyYTM8w3lo9cA==
 
 linkify-it@^3.0.1:
   version "3.0.3"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e"
+  resolved "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz"
   integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==
   dependencies:
     uc.micro "^1.0.1"
 
 linkifyjs@^3.0.5:
   version "3.0.5"
-  resolved "https://registry.yarnpkg.com/linkifyjs/-/linkifyjs-3.0.5.tgz#99e51a3a0c0e232fcb63ebb89eea3ff923378f34"
+  resolved "https://registry.npmjs.org/linkifyjs/-/linkifyjs-3.0.5.tgz"
   integrity sha512-1Y9XQH65eQKA9p2xtk+zxvnTeQBG7rdAXSkUG97DmuI/Xhji9uaUzaWxRj6rf9YC0v8KKHkxav7tnLX82Sz5Fg==
 
 load-json-file@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
+  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"
   integrity sha512-cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==
   dependencies:
     graceful-fs "^4.1.2"
@@ -7130,13 +7636,13 @@ load-json-file@^1.0.0:
 
 loader-runner@^4.2.0:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
+  resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz"
   integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
 loader-utils@^1.0.2, loader-utils@^1.1.0:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.2.tgz#29a957f3a63973883eb684f10ffd3d151fec01a3"
-  integrity sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz"
+  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -7144,7 +7650,7 @@ loader-utils@^1.0.2, loader-utils@^1.1.0:
 
 loader-utils@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
+  resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz"
   integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==
   dependencies:
     big.js "^5.2.2"
@@ -7153,40 +7659,40 @@ loader-utils@^2.0.0:
 
 localforage@^1.10.0:
   version "1.10.0"
-  resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4"
+  resolved "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz"
   integrity sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==
   dependencies:
     lie "3.1.1"
 
 locate-path@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"
   integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
   dependencies:
     p-locate "^4.1.0"
 
 locate-path@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  resolved "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz"
   integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
   dependencies:
     p-locate "^5.0.0"
 
 lodash._baseiteratee@~4.7.0:
   version "4.7.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseiteratee/-/lodash._baseiteratee-4.7.0.tgz#34a9b5543572727c3db2e78edae3c0e9e66bd102"
+  resolved "https://registry.npmjs.org/lodash._baseiteratee/-/lodash._baseiteratee-4.7.0.tgz"
   integrity sha512-nqB9M+wITz0BX/Q2xg6fQ8mLkyfF7MU7eE+MNBNjTHFKeKaZAPEzEg+E8LWxKWf1DQVflNEn9N49yAuqKh2mWQ==
   dependencies:
     lodash._stringtopath "~4.8.0"
 
 lodash._basetostring@~4.12.0:
   version "4.12.0"
-  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz#9327c9dc5158866b7fa4b9d42f4638e5766dd9df"
+  resolved "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz"
   integrity sha512-SwcRIbyxnN6CFEEK4K1y+zuApvWdpQdBHM/swxP962s8HIxPO3alBH5t3m/dl+f4CMUug6sJb7Pww8d13/9WSw==
 
 lodash._baseuniq@~4.6.0:
   version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
+  resolved "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz"
   integrity sha512-Ja1YevpHZctlI5beLA7oc5KNDhGcPixFhcqSiORHNsp/1QTv7amAXzw+gu4YOvErqVlMVyIJGgtzeepCnnur0A==
   dependencies:
     lodash._createset "~4.0.0"
@@ -7194,72 +7700,77 @@ lodash._baseuniq@~4.6.0:
 
 lodash._createset@~4.0.0:
   version "4.0.3"
-  resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
+  resolved "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.3.tgz"
   integrity sha512-GTkC6YMprrJZCYU3zcqZj+jkXkrXzq3IPBcF/fIPpNEAB4hZEtXU8zp/RwKOvZl43NUmwDbyRk3+ZTbeRdEBXA==
 
 lodash._root@~3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
+  resolved "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"
   integrity sha512-O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ==
 
 lodash._stringtopath@~4.8.0:
   version "4.8.0"
-  resolved "https://registry.yarnpkg.com/lodash._stringtopath/-/lodash._stringtopath-4.8.0.tgz#941bcf0e64266e5fc1d66fed0a6959544c576824"
+  resolved "https://registry.npmjs.org/lodash._stringtopath/-/lodash._stringtopath-4.8.0.tgz"
   integrity sha512-SXL66C731p0xPDC5LZg4wI5H+dJo/EO4KTqOMwLYCH3+FmmfAKJEZCm6ohGpI+T1xwsDsJCfL4OnhorllvlTPQ==
   dependencies:
     lodash._basetostring "~4.12.0"
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
+  resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
   integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
 lodash.get@^4.4.2:
   version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
+  resolved "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz"
   integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
 
 lodash.groupby@^4.6.0:
   version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.groupby/-/lodash.groupby-4.6.0.tgz#0b08a1dcf68397c397855c3239783832df7403d1"
+  resolved "https://registry.npmjs.org/lodash.groupby/-/lodash.groupby-4.6.0.tgz"
   integrity sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw==
 
+lodash.isequal@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==
+
 lodash.memoize@4.1.2, lodash.memoize@4.x, lodash.memoize@^4.1.2:
   version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
+  resolved "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"
   integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
 
 lodash.merge@^4.6.2:
   version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
 lodash.throttle@^4.1.1:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
+  resolved "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz"
   integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==
 
 lodash.uniq@^4.5.0:
   version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
+  resolved "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"
   integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
 
 lodash.uniqby@4.5.0:
   version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.5.0.tgz#a3a17bbf62eeb6240f491846e97c1c4e2a5e1e21"
+  resolved "https://registry.npmjs.org/lodash.uniqby/-/lodash.uniqby-4.5.0.tgz"
   integrity sha512-IRt7cfTtHy6f1aRVA5n7kT8rgN3N1nH6MOWLcHfpWG2SH19E3JksLK38MktLxZDhlAjCP9jpIXkOnRXlu6oByQ==
   dependencies:
     lodash._baseiteratee "~4.7.0"
     lodash._baseuniq "~4.6.0"
 
-lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0:
+lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21:
   version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 log4js@^6.4.1:
   version "6.6.1"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.6.1.tgz#48f23de8a87d2f5ffd3d913f24ca9ce77895272f"
+  resolved "https://registry.npmjs.org/log4js/-/log4js-6.6.1.tgz"
   integrity sha512-J8VYFH2UQq/xucdNu71io4Fo+purYYudyErgBbswWKO0MC6QVOERRomt5su/z6d3RJSmLyTGmXl3Q/XjKCf+/A==
   dependencies:
     date-format "^4.0.13"
@@ -7270,14 +7781,14 @@ log4js@^6.4.1:
 
 lower-case@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
+  resolved "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz"
   integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
   dependencies:
     tslib "^2.0.3"
 
 lru-cache@^4.1.2, lru-cache@^4.1.5:
   version "4.1.5"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz"
   integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
   dependencies:
     pseudomap "^1.0.2"
@@ -7285,14 +7796,14 @@ lru-cache@^4.1.2, lru-cache@^4.1.5:
 
 lru-cache@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
   integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
   dependencies:
     yallist "^4.0.0"
 
-make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
+make-dir@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
   dependencies:
     semver "^6.0.0"
@@ -7304,38 +7815,38 @@ make-error@1.x:
 
 make-iterator@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/make-iterator/-/make-iterator-1.0.1.tgz#29b33f312aa8f547c4a5e490f56afcec99133ad6"
+  resolved "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz"
   integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
   dependencies:
     kind-of "^6.0.2"
 
 makeerror@1.0.12:
   version "1.0.12"
-  resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
+  resolved "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz"
   integrity sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==
   dependencies:
     tmpl "1.0.5"
 
 map-cache@^0.2.0, map-cache@^0.2.2:
   version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  resolved "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"
   integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
 
 map-visit@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  resolved "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"
   integrity sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==
   dependencies:
     object-visit "^1.0.0"
 
 markdown-it-regexp@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/markdown-it-regexp/-/markdown-it-regexp-0.4.0.tgz#d64d713eecec55ce4cfdeb321750ecc099e2c2dc"
+  resolved "https://registry.npmjs.org/markdown-it-regexp/-/markdown-it-regexp-0.4.0.tgz"
   integrity sha512-0XQmr46K/rMKnI93Y3CLXsHj4jIioRETTAiVnJnjrZCEkGaDOmUxTbZj/aZ17G5NlRcVpWBYjqpwSlQ9lj+Kxw==
 
 markdown-it@^12.3.2:
   version "12.3.2"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90"
+  resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz"
   integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==
   dependencies:
     argparse "^2.0.1"
@@ -7346,7 +7857,7 @@ markdown-it@^12.3.2:
 
 matchdep@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/matchdep/-/matchdep-2.0.0.tgz#c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"
+  resolved "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz"
   integrity sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA==
   dependencies:
     findup-sync "^2.0.0"
@@ -7356,61 +7867,61 @@ matchdep@^2.0.0:
 
 mdn-data@2.0.14:
   version "2.0.14"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
+  resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz"
   integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
 
 mdn-data@2.0.28:
   version "2.0.28"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba"
+  resolved "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz"
   integrity sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==
 
 mdurl@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  resolved "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"
   integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
 
 media-typer@0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
   integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
 memfs@^3.4.3:
   version "3.4.7"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.7.tgz#e5252ad2242a724f938cb937e3c4f7ceb1f70e5a"
+  resolved "https://registry.npmjs.org/memfs/-/memfs-3.4.7.tgz"
   integrity sha512-ygaiUSNalBX85388uskeCyhSAoOSgzBbtVCr9jA2RROssFL9Q19/ZXFqS+2Th2sr1ewNIWgFdLzLC3Yl1Zv+lw==
   dependencies:
     fs-monkey "^1.0.3"
 
 merge-descriptors@1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
   integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
 
 merge-source-map@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646"
+  resolved "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz"
   integrity sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==
   dependencies:
     source-map "^0.6.1"
 
 merge-stream@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
 merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
 methods@~1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
 micromatch@^3.0.4, micromatch@^3.1.4:
   version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  resolved "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
     arr-diff "^4.0.0"
@@ -7429,7 +7940,7 @@ micromatch@^3.0.4, micromatch@^3.1.4:
 
 micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4:
   version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
+  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
   dependencies:
     braces "^3.0.2"
@@ -7437,75 +7948,70 @@ micromatch@^4.0.0, micromatch@^4.0.2, micromatch@^4.0.4:
 
 mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
   version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
 mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
     mime-db "1.52.0"
 
 mime@1.6.0:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.5.2:
   version "2.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
+  resolved "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz"
   integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
 
 mimic-fn@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
 min-indent@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
+  resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
 mini-css-extract-plugin@^2.5.3:
   version "2.6.1"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz#9a1251d15f2035c342d99a468ab9da7a0451b71e"
+  resolved "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz"
   integrity sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg==
   dependencies:
     schema-utils "^4.0.0"
 
 minimalistic-assert@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  resolved "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
 minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimatch@^5.0.1:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz"
   integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.2.0:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
-  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
-
-minimist@^1.2.6:
+minimist@^1.2.0, minimist@^1.2.6:
   version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
 mixin-deep@^1.2.0:
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  resolved "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz"
   integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
   dependencies:
     for-in "^1.0.2"
@@ -7513,44 +8019,44 @@ mixin-deep@^1.2.0:
 
 mkdirp@^0.5.5:
   version "0.5.6"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"
   integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
   dependencies:
     minimist "^1.2.6"
 
 moment@2.20.1:
   version "2.20.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
+  resolved "https://registry.npmjs.org/moment/-/moment-2.20.1.tgz"
   integrity sha512-Yh9y73JRljxW5QxN08Fner68eFLxM5ynNOAw2LbIB1YAGeQzZT8QFSUvkAz609Zf+IHhhaUxqZK8dG3W/+HEvg==
 
 moment@2.x:
   version "2.29.4"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
+  resolved "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz"
   integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
 
 moo@^0.5.1:
   version "0.5.1"
-  resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.1.tgz#7aae7f384b9b09f620b6abf6f74ebbcd1b65dbc4"
+  resolved "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz"
   integrity sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==
 
 ms@2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
   integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
 ms@2.1.2:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
 ms@2.1.3:
   version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 multicast-dns@^7.2.5:
   version "7.2.5"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-7.2.5.tgz#77eb46057f4d7adbd16d9290fa7299f6fa64cced"
+  resolved "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz"
   integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==
   dependencies:
     dns-packet "^5.2.2"
@@ -7558,17 +8064,17 @@ multicast-dns@^7.2.5:
 
 mute-stdout@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331"
+  resolved "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz"
   integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==
 
 nanoid@^3.3.4:
   version "3.3.4"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
+  resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz"
   integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
 
 nanomatch@^1.2.9:
   version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  resolved "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"
   integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
   dependencies:
     arr-diff "^4.0.0"
@@ -7590,27 +8096,27 @@ natural-compare-lite@^1.4.0:
 
 natural-compare@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 negotiator@0.6.3:
   version "0.6.3"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
 neo-async@^2.6.2:
   version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
 next-tick@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
+  resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz"
   integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
 
 nise@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/nise/-/nise-5.1.1.tgz#ac4237e0d785ecfcb83e20f389185975da5c31f3"
+  resolved "https://registry.npmjs.org/nise/-/nise-5.1.1.tgz"
   integrity sha512-yr5kW2THW1AkxVmCnKEh4nbYkJdB3I7LUkiUgOvEkOp414mc2UMaHMA7pjq1nYowhdoJZGwEKGaQVbxfpWj10A==
   dependencies:
     "@sinonjs/commons" "^1.8.3"
@@ -7621,7 +8127,7 @@ nise@^5.1.1:
 
 no-case@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
+  resolved "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz"
   integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
   dependencies:
     lower-case "^2.0.2"
@@ -7629,41 +8135,41 @@ no-case@^3.0.4:
 
 node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@~2.6.1:
   version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
+  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
   dependencies:
     whatwg-url "^5.0.0"
 
 node-forge@^1:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
+  resolved "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz"
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
 node-int64@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
+  resolved "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz"
   integrity sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==
 
 node-releases@^2.0.6:
   version "2.0.6"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.6.tgz#8a7088c63a55e493845683ebf3c828d8c51c5503"
+  resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz"
   integrity sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==
 
 node-watch@0.7.3:
   version "0.7.3"
-  resolved "https://registry.yarnpkg.com/node-watch/-/node-watch-0.7.3.tgz#6d4db88e39c8d09d3ea61d6568d80e5975abc7ab"
+  resolved "https://registry.npmjs.org/node-watch/-/node-watch-0.7.3.tgz"
   integrity sha512-3l4E8uMPY1HdMMryPRUAl+oIHtXtyiTlIiESNSVSNxcPfzAFzeTbXFQkZfAwBbo0B1qMSG8nUABx+Gd+YrbKrQ==
 
 nopt@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d"
+  resolved "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz"
   integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
   dependencies:
     abbrev "^1.0.0"
 
 normalize-package-data@^2.3.2:
   version "2.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"
   integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
   dependencies:
     hosted-git-info "^2.1.4"
@@ -7673,70 +8179,72 @@ normalize-package-data@^2.3.2:
 
 normalize-path@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
+  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"
   integrity sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==
   dependencies:
     remove-trailing-separator "^1.0.1"
 
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
 normalize-range@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
+  resolved "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"
   integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
 
 normalize-url@^6.0.1:
   version "6.1.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
+  resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz"
   integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
 now-and-later@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-2.0.1.tgz#8e579c8685764a7cc02cb680380e94f43ccb1f7c"
+  resolved "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz"
   integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==
   dependencies:
     once "^1.3.2"
 
 npm-run-path@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"
   integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
   dependencies:
     path-key "^3.0.0"
 
 nth-check@^2.0.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
+  resolved "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz"
   integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
   dependencies:
     boolbase "^1.0.0"
 
 number-is-nan@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
+  resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
   integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==
 
-numbro@1.11.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/numbro/-/numbro-1.11.0.tgz#39aa17b358b4682aec8ca0d5755f35c5d9ce8f9e"
-  integrity sha512-HLgprbMBJf/h3zQ91KpvjzTWyxd9pS2xOFoEBTdkUusBi9eSqYq+RlhFn8i+WSHy/ghGRtbN5brnABOR21z4kA==
+numbro@^2.0.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/numbro/-/numbro-2.3.6.tgz#4bd622ebe59ccbc49dad365c5b9eed200781fa21"
+  integrity sha512-pxpoTT3hVxQGaOA2RTzXR/muonQNd1K1HPJbWo7QOmxPwiPmoFCFfsG9XXgW3uqjyzezJ0P9IvCPDXUtJexjwg==
+  dependencies:
+    bignumber.js "^8.1.1"
 
-nwsapi@^2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.1.tgz#10a9f268fbf4c461249ebcfe38e359aa36e2577c"
-  integrity sha512-JYOWTeFoS0Z93587vRJgASD5Ut11fYl5NyihP3KrYBvMe1FRRs6RN7m20SA/16GM4P6hTnZjT+UmDOt38UeXNg==
+nwsapi@^2.2.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.2.tgz#e5418863e7905df67d51ec95938d67bf801f0bb0"
+  integrity sha512-90yv+6538zuvUMnN+zCr8LuV6bPFdq50304114vJYJ8RDyK8D5O9Phpbd6SZWgI7PwzmmfN1upeOJlvybDSgCw==
 
 object-assign@^4:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-copy@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  resolved "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"
   integrity sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==
   dependencies:
     copy-descriptor "^0.1.0"
@@ -7745,17 +8253,17 @@ object-copy@^0.1.0:
 
 object-hash@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
+  resolved "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz"
   integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
 
 object-inspect@^1.12.0, object-inspect@^1.9.0:
   version "1.12.2"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
+  resolved "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz"
   integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
 
 object-is@^1.0.1, object-is@^1.1.5:
   version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
+  resolved "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"
   integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
   dependencies:
     call-bind "^1.0.2"
@@ -7763,19 +8271,19 @@ object-is@^1.0.1, object-is@^1.1.5:
 
 object-keys@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-visit@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  resolved "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"
   integrity sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==
   dependencies:
     isobject "^3.0.0"
 
 object.assign@^4.0.4, object.assign@^4.1.2:
   version "4.1.3"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.3.tgz#d36b7700ddf0019abb6b1df1bb13f6445f79051f"
+  resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.3.tgz"
   integrity sha512-ZFJnX3zltyjcYJL0RoCJuzb+11zWGyaDbjgxZbdV7rFEcHQuYxrZqhow67aA7xpes6LhojyFDaBKAFfogQrikA==
   dependencies:
     call-bind "^1.0.2"
@@ -7795,7 +8303,7 @@ object.assign@^4.1.0, object.assign@^4.1.4:
 
 object.defaults@^1.0.0, object.defaults@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
+  resolved "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"
   integrity sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==
   dependencies:
     array-each "^1.0.1"
@@ -7805,7 +8313,7 @@ object.defaults@^1.0.0, object.defaults@^1.1.0:
 
 object.map@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object.map/-/object.map-1.0.1.tgz#cf83e59dc8fcc0ad5f4250e1f78b3b81bd801d37"
+  resolved "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz"
   integrity sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==
   dependencies:
     for-own "^1.0.0"
@@ -7813,14 +8321,14 @@ object.map@^1.0.0:
 
 object.pick@^1.2.0, object.pick@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  resolved "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"
   integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==
   dependencies:
     isobject "^3.0.1"
 
 object.reduce@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object.reduce/-/object.reduce-1.0.1.tgz#6fe348f2ac7fa0f95ca621226599096825bb03ad"
+  resolved "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz"
   integrity sha512-naLhxxpUESbNkRqc35oQ2scZSJueHGQNUfMW/0U37IgN6tE2dgDWg3whf+NEliy3F/QysrO48XKUz/nGPe+AQw==
   dependencies:
     for-own "^1.0.0"
@@ -7828,45 +8336,45 @@ object.reduce@^1.0.0:
 
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
+  resolved "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
 on-finished@2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
+  resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"
   integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
   dependencies:
     ee-first "1.1.1"
 
 on-finished@~2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"
   integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==
   dependencies:
     ee-first "1.1.1"
 
 on-headers@~1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  resolved "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
 once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
   integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
 onetime@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
 open@^8.0.9:
   version "8.4.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
+  resolved "https://registry.npmjs.org/open/-/open-8.4.0.tgz"
   integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
   dependencies:
     define-lazy-prop "^2.0.0"
@@ -7892,7 +8400,7 @@ openapi-typescript@^6.1.0:
 
 optionator@^0.8.1:
   version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  resolved "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
   dependencies:
     deep-is "~0.1.3"
@@ -7904,7 +8412,7 @@ optionator@^0.8.1:
 
 optionator@^0.9.1:
   version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+  resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"
   integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
   dependencies:
     deep-is "^0.1.3"
@@ -7916,56 +8424,56 @@ optionator@^0.9.1:
 
 ordered-read-streams@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz#77c0cb37c41525d64166d990ffad7ec6a0e1363e"
+  resolved "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz"
   integrity sha512-Z87aSjx3r5c0ZB7bcJqIgIRX5bxR7A4aSzvIbaxd0oTkWBCOoKfuGHiKj60CHVUgg1Phm5yMZzBdt8XqRs73Mw==
   dependencies:
     readable-stream "^2.0.1"
 
 os-locale@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
+  resolved "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"
   integrity sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==
   dependencies:
     lcid "^1.0.0"
 
 p-limit@^2.2.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^3.0.2:
+p-limit@^3.0.2, p-limit@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
     yocto-queue "^0.1.0"
 
 p-locate@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"
   integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
   dependencies:
     p-limit "^2.2.0"
 
 p-locate@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  resolved "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz"
   integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
   dependencies:
     p-limit "^3.0.2"
 
 p-map@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  resolved "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"
   integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
   dependencies:
     aggregate-error "^3.0.0"
 
 p-retry@^4.5.0:
   version "4.6.2"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.2.tgz#9baae7184057edd4e17231cee04264106e092a16"
+  resolved "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz"
   integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==
   dependencies:
     "@types/retry" "0.12.0"
@@ -7973,19 +8481,19 @@ p-retry@^4.5.0:
 
 p-try@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
 parent-module@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
   integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
   dependencies:
     callsites "^3.0.0"
 
 parse-filepath@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
+  resolved "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"
   integrity sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==
   dependencies:
     is-absolute "^1.0.0"
@@ -7994,14 +8502,14 @@ parse-filepath@^1.0.1:
 
 parse-json@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
+  resolved "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"
   integrity sha512-QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ==
   dependencies:
     error-ex "^1.2.0"
 
 parse-json@^5.0.0, parse-json@^5.2.0:
   version "5.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  resolved "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
@@ -8011,88 +8519,90 @@ parse-json@^5.0.0, parse-json@^5.2.0:
 
 parse-node-version@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
+  resolved "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz"
   integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
 
 parse-passwd@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  resolved "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"
   integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
 
-parse5@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
-  integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
+parse5@^7.0.0, parse5@^7.1.1:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
+  integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
+  dependencies:
+    entities "^4.4.0"
 
 parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
 pascalcase@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  resolved "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"
   integrity sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==
 
 path-dirname@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
+  resolved "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"
   integrity sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==
 
 path-exists@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
+  resolved "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
   integrity sha512-yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ==
   dependencies:
     pinkie-promise "^2.0.0"
 
 path-exists@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.7:
   version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-root-regex@^0.1.0:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+  resolved "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz"
   integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==
 
 path-root@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+  resolved "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz"
   integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==
   dependencies:
     path-root-regex "^0.1.0"
 
 path-to-regexp@0.1.7:
   version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
   integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
 
 path-to-regexp@^1.7.0:
   version "1.8.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
+  resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz"
   integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
   dependencies:
     isarray "0.0.1"
 
 path-type@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
+  resolved "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"
   integrity sha512-S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==
   dependencies:
     graceful-fs "^4.1.2"
@@ -8101,37 +8611,37 @@ path-type@^1.0.0:
 
 path-type@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
 performance-now@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
+  resolved "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"
   integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==
 
 picocolors@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
+  resolved "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"
   integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
 
 picocolors@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
 pify@^2.0.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+  resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
   integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
 pikaday@1.5.1:
   version "1.5.1"
-  resolved "https://registry.yarnpkg.com/pikaday/-/pikaday-1.5.1.tgz#0a48549bc1a14ea1d08c44074d761bc2f2bfcfd3"
+  resolved "https://registry.npmjs.org/pikaday/-/pikaday-1.5.1.tgz"
   integrity sha512-JpGs4DM+DrwhGx/deyi2pUcrUtTcyegR6XOIbFkjSaJp0yYp5d8Bvzlgtl8eaX1gNEqsqJZFIsRMEzdRA1xbDQ==
   optionalDependencies:
     moment "2.x"
@@ -8142,55 +8652,55 @@ pinia-plugin-persistedstate@^2.4.0:
   integrity sha512-bQcpv47jk3ISl+InuJWsFaS/K7pRZ97kfoD2WCf/suhnlLy48k3BnFM2tI6YZ1xMsDaPv4yOsaPuPAUuSmEO2Q==
 
 pinia@^2.0.23:
-  version "2.0.23"
-  resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.0.23.tgz#570f5f82160b656b412602789683faa95502d227"
-  integrity sha512-N15hFf4o5STrxpNrib1IEb1GOArvPYf1zPvQVRGOO1G1d74Ak0J0lVyalX/SmrzdT4Q0nlEFjbURsmBmIGUR5Q==
+  version "2.0.25"
+  resolved "https://registry.yarnpkg.com/pinia/-/pinia-2.0.25.tgz#1e9d50ab54d106c8fcb39090293d780b3b8152b6"
+  integrity sha512-3reAkjJ6bW2D5hZKRMS0c9rUbHVlsVyZd037xO0PJr2AuF/09RRSBnFLlJgmHF4Jx6dEoW/jZBOHTushY7IMlw==
   dependencies:
-    "@vue/devtools-api" "^6.4.4"
+    "@vue/devtools-api" "^6.4.5"
     vue-demi "*"
 
 pinkie-promise@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
+  resolved "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
   integrity sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==
   dependencies:
     pinkie "^2.0.0"
 
 pinkie@^2.0.0:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
+  resolved "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
   integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
 
 pirates@^4.0.4:
   version "4.0.5"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
+  resolved "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz"
   integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
 
-pkg-dir@^4.1.0, pkg-dir@^4.2.0:
+pkg-dir@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
   dependencies:
     find-up "^4.0.0"
 
 popper.js@^1.16.1:
   version "1.16.1"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b"
+  resolved "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz"
   integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
 
 portal-vue@^2.1.7:
   version "2.1.7"
-  resolved "https://registry.yarnpkg.com/portal-vue/-/portal-vue-2.1.7.tgz#ea08069b25b640ca08a5b86f67c612f15f4e4ad4"
+  resolved "https://registry.npmjs.org/portal-vue/-/portal-vue-2.1.7.tgz"
   integrity sha512-+yCno2oB3xA7irTt0EU5Ezw22L2J51uKAacE/6hMPMoO/mx3h4rXFkkBkT4GFsMDv/vEe8TNKC3ujJJ0PTwb6g==
 
 posix-character-classes@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  resolved "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"
   integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
 
 postcss-calc@^8.2.3:
   version "8.2.4"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5"
+  resolved "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz"
   integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==
   dependencies:
     postcss-selector-parser "^6.0.9"
@@ -8198,7 +8708,7 @@ postcss-calc@^8.2.3:
 
 postcss-colormin@^5.3.0:
   version "5.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.0.tgz#3cee9e5ca62b2c27e84fce63affc0cfb5901956a"
+  resolved "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz"
   integrity sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==
   dependencies:
     browserslist "^4.16.6"
@@ -8208,7 +8718,7 @@ postcss-colormin@^5.3.0:
 
 postcss-convert-values@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.2.tgz#31586df4e184c2e8890e8b34a0b9355313f503ab"
+  resolved "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.2.tgz"
   integrity sha512-c6Hzc4GAv95B7suy4udszX9Zy4ETyMCgFPUDtWjdFTKH1SE9eFY/jEpHSwTH1QPuwxHpWslhckUQWbNRM4ho5g==
   dependencies:
     browserslist "^4.20.3"
@@ -8216,27 +8726,27 @@ postcss-convert-values@^5.1.2:
 
 postcss-discard-comments@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696"
+  resolved "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz"
   integrity sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==
 
 postcss-discard-duplicates@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848"
+  resolved "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz"
   integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==
 
 postcss-discard-empty@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c"
+  resolved "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz"
   integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==
 
 postcss-discard-overridden@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e"
+  resolved "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz"
   integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==
 
 postcss-loader@^7.0.1:
   version "7.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-7.0.1.tgz#4c883cc0a1b2bfe2074377b7a74c1cd805684395"
+  resolved "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.1.tgz"
   integrity sha512-VRviFEyYlLjctSM93gAZtcJJ/iSkPZ79zWbN/1fSH+NisBByEiVLqpdVDrPLVSi8DX0oJo12kL/GppTBdKVXiQ==
   dependencies:
     cosmiconfig "^7.0.0"
@@ -8245,7 +8755,7 @@ postcss-loader@^7.0.1:
 
 postcss-merge-longhand@^5.1.6:
   version "5.1.6"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.6.tgz#f378a8a7e55766b7b644f48e5d8c789ed7ed51ce"
+  resolved "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.6.tgz"
   integrity sha512-6C/UGF/3T5OE2CEbOuX7iNO63dnvqhGZeUnKkDeifebY0XqkkvrctYSZurpNE902LDf2yKwwPFgotnfSoPhQiw==
   dependencies:
     postcss-value-parser "^4.2.0"
@@ -8253,7 +8763,7 @@ postcss-merge-longhand@^5.1.6:
 
 postcss-merge-rules@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.2.tgz#7049a14d4211045412116d79b751def4484473a5"
+  resolved "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.2.tgz"
   integrity sha512-zKMUlnw+zYCWoPN6yhPjtcEdlJaMUZ0WyVcxTAmw3lkkN/NDMRkOkiuctQEoWAOvH7twaxUUdvBWl0d4+hifRQ==
   dependencies:
     browserslist "^4.16.6"
@@ -8263,14 +8773,14 @@ postcss-merge-rules@^5.1.2:
 
 postcss-minify-font-values@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b"
+  resolved "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz"
   integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-minify-gradients@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz#f1fe1b4f498134a5068240c2f25d46fcd236ba2c"
+  resolved "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz"
   integrity sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==
   dependencies:
     colord "^2.9.1"
@@ -8279,7 +8789,7 @@ postcss-minify-gradients@^5.1.1:
 
 postcss-minify-params@^5.1.3:
   version "5.1.3"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz#ac41a6465be2db735099bbd1798d85079a6dc1f9"
+  resolved "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.3.tgz"
   integrity sha512-bkzpWcjykkqIujNL+EVEPOlLYi/eZ050oImVtHU7b4lFS82jPnsCb44gvC6pxaNt38Els3jWYDHTjHKf0koTgg==
   dependencies:
     browserslist "^4.16.6"
@@ -8288,19 +8798,19 @@ postcss-minify-params@^5.1.3:
 
 postcss-minify-selectors@^5.2.1:
   version "5.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6"
+  resolved "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz"
   integrity sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==
   dependencies:
     postcss-selector-parser "^6.0.5"
 
 postcss-modules-extract-imports@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
+  resolved "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"
   integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
 
 postcss-modules-local-by-default@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
+  resolved "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"
   integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
   dependencies:
     icss-utils "^5.0.0"
@@ -8309,61 +8819,61 @@ postcss-modules-local-by-default@^4.0.0:
 
 postcss-modules-scope@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
+  resolved "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"
   integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
   dependencies:
     postcss-selector-parser "^6.0.4"
 
 postcss-modules-values@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
+  resolved "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"
   integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
   dependencies:
     icss-utils "^5.0.0"
 
 postcss-normalize-charset@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed"
+  resolved "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz"
   integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==
 
 postcss-normalize-display-values@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8"
+  resolved "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz"
   integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-positions@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz#ef97279d894087b59325b45c47f1e863daefbb92"
+  resolved "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz"
   integrity sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-repeat-style@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz#e9eb96805204f4766df66fd09ed2e13545420fb2"
+  resolved "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz"
   integrity sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-string@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228"
+  resolved "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz"
   integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-timing-functions@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb"
+  resolved "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz"
   integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-normalize-unicode@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz#3d23aede35e160089a285e27bf715de11dc9db75"
+  resolved "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz"
   integrity sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==
   dependencies:
     browserslist "^4.16.6"
@@ -8371,7 +8881,7 @@ postcss-normalize-unicode@^5.1.0:
 
 postcss-normalize-url@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc"
+  resolved "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz"
   integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==
   dependencies:
     normalize-url "^6.0.1"
@@ -8379,14 +8889,14 @@ postcss-normalize-url@^5.1.0:
 
 postcss-normalize-whitespace@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa"
+  resolved "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz"
   integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-ordered-values@^5.1.3:
   version "5.1.3"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz#b6fd2bd10f937b23d86bc829c69e7732ce76ea38"
+  resolved "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz"
   integrity sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==
   dependencies:
     cssnano-utils "^3.1.0"
@@ -8394,7 +8904,7 @@ postcss-ordered-values@^5.1.3:
 
 postcss-reduce-initial@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz#fc31659ea6e85c492fb2a7b545370c215822c5d6"
+  resolved "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz"
   integrity sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==
   dependencies:
     browserslist "^4.16.6"
@@ -8402,14 +8912,14 @@ postcss-reduce-initial@^5.1.0:
 
 postcss-reduce-transforms@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9"
+  resolved "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz"
   integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
 postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
   version "6.0.10"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d"
+  resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz"
   integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==
   dependencies:
     cssesc "^3.0.0"
@@ -8417,7 +8927,7 @@ postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector
 
 postcss-svgo@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d"
+  resolved "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz"
   integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==
   dependencies:
     postcss-value-parser "^4.2.0"
@@ -8425,19 +8935,19 @@ postcss-svgo@^5.1.0:
 
 postcss-unique-selectors@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6"
+  resolved "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz"
   integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==
   dependencies:
     postcss-selector-parser "^6.0.5"
 
 postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
+  resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
 postcss@^7.0.36:
   version "7.0.39"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
+  resolved "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz"
   integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
   dependencies:
     picocolors "^0.2.1"
@@ -8445,7 +8955,7 @@ postcss@^7.0.36:
 
 postcss@^8.4.13, postcss@^8.4.14, postcss@^8.4.7:
   version "8.4.16"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c"
+  resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz"
   integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==
   dependencies:
     nanoid "^3.3.4"
@@ -8454,27 +8964,27 @@ postcss@^8.4.13, postcss@^8.4.14, postcss@^8.4.7:
 
 prelude-ls@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
 prelude-ls@~1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"
   integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
 
 "prettier@^1.18.2 || ^2.0.0", prettier@^2.7.1:
   version "2.7.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64"
+  resolved "https://registry.npmjs.org/prettier/-/prettier-2.7.1.tgz"
   integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g==
 
 pretty-bytes@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-6.0.0.tgz#928be2ad1f51a2e336add8ba764739f9776a8140"
+  resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-6.0.0.tgz"
   integrity sha512-6UqkYefdogmzqAZWzJ7laYeJnaXDy2/J+ZqiiMtS7t7OfpXWTlaeGMwX8U6EFvPV/YWWEKRkS8hKS4k60WHTOg==
 
 pretty-format@^27.5.1:
   version "27.5.1"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.5.1.tgz#2181879fdea51a7a5851fb39d920faa63f01d88e"
+  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz"
   integrity sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==
   dependencies:
     ansi-regex "^5.0.1"
@@ -8483,7 +8993,7 @@ pretty-format@^27.5.1:
 
 pretty-format@^28.0.0, pretty-format@^28.1.3:
   version "28.1.3"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-28.1.3.tgz#c9fba8cedf99ce50963a11b27d982a9ae90970d5"
+  resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-28.1.3.tgz"
   integrity sha512-8gFb/To0OmxHR9+ZTb14Df2vNxdGCX8g1xWGUTqUw5TiZvcQf5sHKObd5UcPyLLyowNwDAMTF3XWOG1B6mxl1Q==
   dependencies:
     "@jest/schemas" "^28.1.3"
@@ -8491,14 +9001,23 @@ pretty-format@^28.0.0, pretty-format@^28.1.3:
     ansi-styles "^5.0.0"
     react-is "^18.0.0"
 
+pretty-format@^29.3.1:
+  version "29.3.1"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-29.3.1.tgz#1841cac822b02b4da8971dacb03e8a871b4722da"
+  integrity sha512-FyLnmb1cYJV8biEIiRyzRFvs2lry7PPIvOqKVe1GCUEYg4YGmlx1qG9EJNMxArYm7piII4qb8UV1Pncq5dxmcg==
+  dependencies:
+    "@jest/schemas" "^29.0.0"
+    ansi-styles "^5.0.0"
+    react-is "^18.0.0"
+
 pretty-hrtime@^1.0.0:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
+  resolved "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"
   integrity sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==
 
 pretty@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pretty/-/pretty-2.0.0.tgz#adbc7960b7bbfe289a557dc5f737619a220d06a5"
+  resolved "https://registry.npmjs.org/pretty/-/pretty-2.0.0.tgz"
   integrity sha512-G9xUchgTEiNpormdYBl+Pha50gOUovT18IvAe7EYMZ1/f9W/WWMPRn+xI68yXNMUk3QXHDwo/1wV/4NejVNe1w==
   dependencies:
     condense-newlines "^0.2.1"
@@ -8507,22 +9026,22 @@ pretty@^2.0.0:
 
 prismjs@^1.6.0:
   version "1.28.0"
-  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.28.0.tgz#0d8f561fa0f7cf6ebca901747828b149147044b6"
+  resolved "https://registry.npmjs.org/prismjs/-/prismjs-1.28.0.tgz"
   integrity sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw==
 
 process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
 process@^0.11.10:
   version "0.11.10"
-  resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
+  resolved "https://registry.npmjs.org/process/-/process-0.11.10.tgz"
   integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
 
 prompts@^2.0.1, prompts@~2.4.2:
   version "2.4.2"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
+  resolved "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz"
   integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
   dependencies:
     kleur "^3.0.3"
@@ -8530,7 +9049,7 @@ prompts@^2.0.1, prompts@~2.4.2:
 
 proper-lockfile@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/proper-lockfile/-/proper-lockfile-2.0.1.tgz#159fb06193d32003f4b3691dd2ec1a634aa80d1d"
+  resolved "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.1.tgz"
   integrity sha512-rjaeGbsmhNDcDInmwi4MuI6mRwJu6zq8GjYCLuSuE7GF+4UjgzkL69sVKKJ2T2xH61kK7rXvGYpvaTu909oXaQ==
   dependencies:
     graceful-fs "^4.1.2"
@@ -8538,12 +9057,12 @@ proper-lockfile@^2.0.1:
 
 proto-list@~1.2.1:
   version "1.2.4"
-  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  resolved "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
   integrity sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==
 
 proxy-addr@~2.0.7:
   version "2.0.7"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
+  resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"
   integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
   dependencies:
     forwarded "0.2.0"
@@ -8551,17 +9070,17 @@ proxy-addr@~2.0.7:
 
 pseudomap@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
+  resolved "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"
   integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==
 
 psl@^1.1.33:
   version "1.9.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7"
+  resolved "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"
   integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
 
 pump@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-2.0.1.tgz#12399add6e4cf7526d973cbc8b5ce2e2908b3909"
+  resolved "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"
   integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
   dependencies:
     end-of-stream "^1.1.0"
@@ -8569,7 +9088,7 @@ pump@^2.0.0:
 
 pumpify@^1.3.5:
   version "1.5.1"
-  resolved "https://registry.yarnpkg.com/pumpify/-/pumpify-1.5.1.tgz#36513be246ab27570b1a374a5ce278bfd74370ce"
+  resolved "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz"
   integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
   dependencies:
     duplexify "^3.6.0"
@@ -8578,44 +9097,44 @@ pumpify@^1.3.5:
 
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
+  resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 pyre-to-regexp@^0.0.5:
   version "0.0.5"
-  resolved "https://registry.yarnpkg.com/pyre-to-regexp/-/pyre-to-regexp-0.0.5.tgz#0450c408488ab1bd3b72e867d5c80f8bb94b61f8"
+  resolved "https://registry.npmjs.org/pyre-to-regexp/-/pyre-to-regexp-0.0.5.tgz"
   integrity sha512-AYoI8bSYhCbElpcj/Z7FyP0rrpuuw96GAYCqdrX3fDH+vRXh8lXWeRRZtyJgRO4LgBlb5fK2o2odkaoSGQ6gIQ==
 
 qjobs@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
+  resolved "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz"
   integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
 
 qs@6.10.3:
   version "6.10.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.3.tgz#d6cde1b2ffca87b5aa57889816c5f81535e22e8e"
+  resolved "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz"
   integrity sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==
   dependencies:
     side-channel "^1.0.4"
 
 querystring-es3@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
+  resolved "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"
   integrity sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==
 
 querystringify@^2.1.1:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  resolved "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz"
   integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
 queue-microtask@^1.2.2:
   version "1.2.3"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
 qunit@^2.17.2:
   version "2.19.1"
-  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.19.1.tgz#eb1afd188da9e47f07c13aa70461a1d9c4505490"
+  resolved "https://registry.npmjs.org/qunit/-/qunit-2.19.1.tgz"
   integrity sha512-gSGuw0vErE/rNjnlBW/JmE7NNubBlGrDPQvsug32ejYhcVFuZec9yoU0+C30+UgeCGwq6Ap89K65dMGo+kDGZQ==
   dependencies:
     commander "7.2.0"
@@ -8624,26 +9143,26 @@ qunit@^2.17.2:
 
 raf@^3.4.1:
   version "3.4.1"
-  resolved "https://registry.yarnpkg.com/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39"
+  resolved "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz"
   integrity sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==
   dependencies:
     performance-now "^2.1.0"
 
 randombytes@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"
   integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
   dependencies:
     safe-buffer "^5.1.0"
 
 range-parser@^1.2.1, range-parser@~1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
 raw-body@2.5.1:
   version "2.5.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
+  resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"
   integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
   dependencies:
     bytes "3.1.2"
@@ -8653,7 +9172,7 @@ raw-body@2.5.1:
 
 raw-loader@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6"
+  resolved "https://registry.npmjs.org/raw-loader/-/raw-loader-4.0.2.tgz"
   integrity sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==
   dependencies:
     loader-utils "^2.0.0"
@@ -8661,17 +9180,17 @@ raw-loader@^4.0.2:
 
 react-is@^17.0.1:
   version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
+  resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
 react-is@^18.0.0:
   version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
+  resolved "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
 read-pkg-up@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
+  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"
   integrity sha512-WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==
   dependencies:
     find-up "^1.0.0"
@@ -8679,7 +9198,7 @@ read-pkg-up@^1.0.1:
 
 read-pkg@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
+  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"
   integrity sha512-7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==
   dependencies:
     load-json-file "^1.0.0"
@@ -8688,7 +9207,7 @@ read-pkg@^1.0.0:
 
 readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
   dependencies:
     core-util-is "~1.0.0"
@@ -8701,7 +9220,7 @@ readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.5, readable
 
 readable-stream@^3.0.6, readable-stream@^3.5.0:
   version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"
   integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
   dependencies:
     inherits "^2.0.3"
@@ -8710,28 +9229,28 @@ readable-stream@^3.0.6, readable-stream@^3.5.0:
 
 readdirp@~3.6.0:
   version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
   integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
   dependencies:
     picomatch "^2.2.1"
 
 rechoir@^0.6.2:
   version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"
   integrity sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==
   dependencies:
     resolve "^1.1.6"
 
 rechoir@^0.7.0:
   version "0.7.1"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
+  resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz"
   integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
   dependencies:
     resolve "^1.9.0"
 
 redent@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
+  resolved "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz"
   integrity sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==
   dependencies:
     indent-string "^4.0.0"
@@ -8739,36 +9258,43 @@ redent@^3.0.0:
 
 regenerate-unicode-properties@^10.0.1:
   version "10.0.1"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56"
+  resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz"
   integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==
   dependencies:
     regenerate "^1.4.2"
 
+regenerate-unicode-properties@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
+  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
+  dependencies:
+    regenerate "^1.4.2"
+
 regenerate@^1.4.2:
   version "1.4.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
 regenerator-runtime@^0.11.0:
   version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
+  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
 regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7, regenerator-runtime@^0.13.9:
   version "0.13.9"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
+  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"
   integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
 
 regenerator-transform@^0.15.0:
   version "0.15.0"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537"
+  resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz"
   integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  resolved "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"
   integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
     extend-shallow "^3.0.2"
@@ -8776,7 +9302,7 @@ regex-not@^1.0.0, regex-not@^1.0.2:
 
 regexp.prototype.flags@^1.4.3:
   version "1.4.3"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac"
+  resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"
   integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
   dependencies:
     call-bind "^1.0.2"
@@ -8785,12 +9311,12 @@ regexp.prototype.flags@^1.4.3:
 
 regexpp@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
+  resolved "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
 regexpu-core@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.1.0.tgz#2f8504c3fd0ebe11215783a41541e21c79942c6d"
+  resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz"
   integrity sha512-bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA==
   dependencies:
     regenerate "^1.4.2"
@@ -8800,21 +9326,45 @@ regexpu-core@^5.1.0:
     unicode-match-property-ecmascript "^2.0.0"
     unicode-match-property-value-ecmascript "^2.0.0"
 
+regexpu-core@^5.2.1:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.2.2.tgz#3e4e5d12103b64748711c3aad69934d7718e75fc"
+  integrity sha512-T0+1Zp2wjF/juXMrMxHxidqGYn8U4R+zleSJhX9tQ1PUsS8a9UtYfbsF9LdiVgNX3kiX8RNaKM42nfSgvFJjmw==
+  dependencies:
+    regenerate "^1.4.2"
+    regenerate-unicode-properties "^10.1.0"
+    regjsgen "^0.7.1"
+    regjsparser "^0.9.1"
+    unicode-match-property-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.1.0"
+
 regjsgen@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d"
+  resolved "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz"
   integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==
 
+regjsgen@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.7.1.tgz#ee5ef30e18d3f09b7c369b76e7c2373ed25546f6"
+  integrity sha512-RAt+8H2ZEzHeYWxZ3H2z6tF18zyyOnlcdaafLrm21Bguj7uZy6ULibiAFdXEtKQY4Sy7wDTwDiOazasMLc4KPA==
+
 regjsparser@^0.8.2:
   version "0.8.4"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f"
+  resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.8.4.tgz"
   integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==
   dependencies:
     jsesc "~0.5.0"
 
+regjsparser@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.9.1.tgz#272d05aa10c7c1f67095b1ff0addae8442fc5709"
+  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
+  dependencies:
+    jsesc "~0.5.0"
+
 remove-bom-buffer@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz#c2bf1e377520d324f623892e33c10cac2c252b53"
+  resolved "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz"
   integrity sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==
   dependencies:
     is-buffer "^1.1.5"
@@ -8822,7 +9372,7 @@ remove-bom-buffer@^3.0.0:
 
 remove-bom-stream@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz#05f1a593f16e42e1fb90ebf59de8e569525f9523"
+  resolved "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz"
   integrity sha512-wigO8/O08XHb8YPzpDDT+QmRANfW6vLqxfaXm1YXhnFf3AkSLyjfG3GEFg4McZkmgL7KvCj5u2KczkvSP6NfHA==
   dependencies:
     remove-bom-buffer "^3.0.0"
@@ -8831,27 +9381,27 @@ remove-bom-stream@^1.2.0:
 
 remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  resolved "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"
   integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
 
 repeat-element@^1.1.2:
   version "1.1.4"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  resolved "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz"
   integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
 
 repeat-string@1.6.1, repeat-string@^1.6.1:
   version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
+  resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"
   integrity sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==
 
 replace-ext@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
+  resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz"
   integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
 
 replace-homedir@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/replace-homedir/-/replace-homedir-1.0.0.tgz#e87f6d513b928dde808260c12be7fec6ff6e798c"
+  resolved "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz"
   integrity sha512-CHPV/GAglbIB1tnQgaiysb8H2yCy8WQ7lcEwQ/eT+kLj0QHV8LnJW0zpqpE7RSkrMSRoa+EBoag86clf7WAgSg==
   dependencies:
     homedir-polyfill "^1.0.1"
@@ -8860,39 +9410,39 @@ replace-homedir@^1.0.0:
 
 require-directory@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
   integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
 require-from-string@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  resolved "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
 require-main-filename@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
+  resolved "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"
   integrity sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==
 
 requirejs@2.3.6:
   version "2.3.6"
-  resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.6.tgz#e5093d9601c2829251258c0b9445d4d19fa9e7c9"
+  resolved "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz"
   integrity sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==
 
 requires-port@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"
   integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
 resolve-cwd@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+  resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz"
   integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
   dependencies:
     resolve-from "^5.0.0"
 
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  resolved "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"
   integrity sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==
   dependencies:
     expand-tilde "^2.0.0"
@@ -8900,34 +9450,34 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
 
 resolve-from@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
 resolve-from@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
 resolve-options@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-1.1.0.tgz#32bb9e39c06d67338dc9378c0d6d6074566ad131"
+  resolved "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz"
   integrity sha512-NYDgziiroVeDC29xq7bp/CacZERYsA9bXYd1ZmcJlF3BcrZv5pTb4NG7SjdyKDnXZ84aC4vo2u6sNKIA1LCu/A==
   dependencies:
     value-or-function "^3.0.0"
 
 resolve-url@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"
   integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
 
 resolve.exports@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9"
+  resolved "https://registry.npmjs.org/resolve.exports/-/resolve.exports-1.1.0.tgz"
   integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==
 
 resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.4.0, resolve@^1.9.0:
   version "1.22.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177"
+  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"
   integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
   dependencies:
     is-core-module "^2.9.0"
@@ -8936,51 +9486,61 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.
 
 ret@~0.1.10:
   version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  resolved "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
 retry@^0.10.0:
   version "0.10.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
+  resolved "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz"
   integrity sha512-ZXUSQYTHdl3uS7IuCehYfMzKyIDBNoAuUblvy5oGO5UJSUTmStUUVPXbA9Qxd173Bgre53yCQczQuHgRWAdvJQ==
 
 retry@^0.13.1:
   version "0.13.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
+  resolved "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz"
   integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
 
 reusify@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
 rfdc@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
+  resolved "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz"
   integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
 
 rgbcolor@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/rgbcolor/-/rgbcolor-1.0.1.tgz#d6505ecdb304a6595da26fa4b43307306775945d"
+  resolved "https://registry.npmjs.org/rgbcolor/-/rgbcolor-1.0.1.tgz"
   integrity sha512-9aZLIrhRaD97sgVhtJOW6ckOEh6/GnvQtdVNfdZ6s67+3/XwLS9lBcQYzEEhYVeUowN7pRzMLsyGhK2i/xvWbw==
 
 rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
     glob "^7.1.3"
 
+robust-predicates@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-3.0.1.tgz#ecde075044f7f30118682bd9fb3f123109577f9a"
+  integrity sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g==
+
 run-parallel@^1.1.9:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
   integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
   dependencies:
     queue-microtask "^1.2.2"
 
+rw@1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4"
+  integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==
+
 rxjs-report-usage@^1.0.4:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/rxjs-report-usage/-/rxjs-report-usage-1.0.6.tgz#6e06034d9e1592e8a45bee877631638e4bac2576"
+  resolved "https://registry.npmjs.org/rxjs-report-usage/-/rxjs-report-usage-1.0.6.tgz"
   integrity sha512-omv1DIv5z1kV+zDAEjaDjWSkx8w5TbFp5NZoPwUipwzYVcor/4So9ZU3bUyQ1c8lxY5Q0Es/ztWW7PGjY7to0Q==
   dependencies:
     "@babel/parser" "^7.10.3"
@@ -8993,7 +9553,7 @@ rxjs-report-usage@^1.0.4:
 
 rxjs-spy-devtools-plugin@^0.0.4:
   version "0.0.4"
-  resolved "https://registry.yarnpkg.com/rxjs-spy-devtools-plugin/-/rxjs-spy-devtools-plugin-0.0.4.tgz#89ceeb8670c705b971cf0c84ea2e608a2128deaf"
+  resolved "https://registry.npmjs.org/rxjs-spy-devtools-plugin/-/rxjs-spy-devtools-plugin-0.0.4.tgz"
   integrity sha512-zjVGIkGPB2D8kfYSoMpnob81igA96QZ0qUmlywWnJ63XehnfKhiK2omWOTfPYjwGj9jVFpsPj8K6Ia4Ab1nhLg==
   dependencies:
     rxjs "^6.5.5"
@@ -9001,7 +9561,7 @@ rxjs-spy-devtools-plugin@^0.0.4:
 
 rxjs-spy@^7.5.1:
   version "7.5.3"
-  resolved "https://registry.yarnpkg.com/rxjs-spy/-/rxjs-spy-7.5.3.tgz#0194bc23ed0c30fb6a61f8bccbc8090e545b91b9"
+  resolved "https://registry.npmjs.org/rxjs-spy/-/rxjs-spy-7.5.3.tgz"
   integrity sha512-8QsSL6Ma51dTeaJ5Q9zWqhqnCSEkDf56Evs1gUsI9N22oB7bYrPMMx4UnoifNGc+Pko2sGX/xydzinLwGO+2pw==
   dependencies:
     "@types/circular-json" "^0.4.0"
@@ -9013,7 +9573,7 @@ rxjs-spy@^7.5.1:
 
 rxjs-spy@^8.0.2:
   version "8.0.2"
-  resolved "https://registry.yarnpkg.com/rxjs-spy/-/rxjs-spy-8.0.2.tgz#dd510bdb58d798e0bc23121ab67714dd6fd95f88"
+  resolved "https://registry.npmjs.org/rxjs-spy/-/rxjs-spy-8.0.2.tgz"
   integrity sha512-w2yc+EiwYA8J97hxqMD+pxGZkNbRCQwxR660r4nw4Soa8kCvatsdSRc0THndYk9uk6SvZy2RNyiVcxfX39pWpw==
   dependencies:
     "@types/circular-json" "^0.4.0"
@@ -9025,43 +9585,43 @@ rxjs-spy@^8.0.2:
 
 rxjs@^6.5.5:
   version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"
   integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
   dependencies:
     tslib "^1.9.0"
 
 rxjs@^7.5.2:
   version "7.5.6"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.6.tgz#0446577557862afd6903517ce7cae79ecb9662bc"
+  resolved "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz"
   integrity sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==
   dependencies:
     tslib "^2.1.0"
 
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
 safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
 safe-regex@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  resolved "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"
   integrity sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==
   dependencies:
     ret "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3":
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sass-loader@^13.0.2:
   version "13.0.2"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.0.2.tgz#e81a909048e06520e9f2ff25113a801065adb3fe"
+  resolved "https://registry.npmjs.org/sass-loader/-/sass-loader-13.0.2.tgz"
   integrity sha512-BbiqbVmbfJaWVeOOAu2o7DhYWtcNmTfvroVgFXa6k2hHheMxNAeDHLNoDy/Q5aoaVlz0LH+MbMktKwm9vN/j8Q==
   dependencies:
     klona "^2.0.4"
@@ -9069,32 +9629,23 @@ sass-loader@^13.0.2:
 
 sass@^1.53.0:
   version "1.54.4"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.54.4.tgz#803ff2fef5525f1dd01670c3915b4b68b6cba72d"
+  resolved "https://registry.npmjs.org/sass/-/sass-1.54.4.tgz"
   integrity sha512-3tmF16yvnBwtlPrNBHw/H907j8MlOX8aTBnlNX1yrKx24RKcJGPyLhFUwkoKBKesR3unP93/2z14Ll8NicwQUA==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-saxes@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
-  integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
+saxes@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/saxes/-/saxes-6.0.0.tgz#fe5b4a4768df4f14a201b1ba6a65c1f3d9988cc5"
+  integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==
   dependencies:
     xmlchars "^2.2.0"
 
-schema-utils@^2.6.5:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
-  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
-  dependencies:
-    "@types/json-schema" "^7.0.5"
-    ajv "^6.12.4"
-    ajv-keywords "^3.5.2"
-
 schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
+  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz"
   integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
   dependencies:
     "@types/json-schema" "^7.0.8"
@@ -9103,7 +9654,7 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
 
 schema-utils@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
+  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz"
   integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
   dependencies:
     "@types/json-schema" "^7.0.9"
@@ -9113,36 +9664,31 @@ schema-utils@^4.0.0:
 
 select-hose@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
+  resolved "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz"
   integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==
 
 selfsigned@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.1.tgz#8b2df7fa56bf014d19b6007655fff209c0ef0a56"
+  resolved "https://registry.npmjs.org/selfsigned/-/selfsigned-2.0.1.tgz"
   integrity sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==
   dependencies:
     node-forge "^1"
 
 semver-greatest-satisfied-range@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz#13e8c2658ab9691cb0cd71093240280d36f77a5b"
+  resolved "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz"
   integrity sha512-Ny/iyOzSSa8M5ML46IAx3iXc6tfOsYU2R4AXi2UpHk60Zrgyq6eqPj/xiOfS0rRl/iiQ/rdJkVjw/5cdUyCntQ==
   dependencies:
     sver-compat "^1.5.0"
 
 "semver@2 || 3 || 4 || 5", semver@^5.6.0:
   version "5.7.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
-  integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
-
 semver@7.3.5:
   version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  resolved "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
   dependencies:
     lru-cache "^6.0.0"
@@ -9156,19 +9702,19 @@ semver@7.x:
 
 semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7:
+semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7:
   version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  resolved "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"
   integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
   dependencies:
     lru-cache "^6.0.0"
 
 send@0.18.0:
   version "0.18.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
+  resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz"
   integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
   dependencies:
     debug "2.6.9"
@@ -9187,14 +9733,14 @@ send@0.18.0:
 
 serialize-javascript@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
+  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz"
   integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
   dependencies:
     randombytes "^2.1.0"
 
 serve-index@^1.9.1:
   version "1.9.1"
-  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
+  resolved "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"
   integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==
   dependencies:
     accepts "~1.3.4"
@@ -9207,7 +9753,7 @@ serve-index@^1.9.1:
 
 serve-static@1.15.0:
   version "1.15.0"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
+  resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"
   integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
   dependencies:
     encodeurl "~1.0.2"
@@ -9217,12 +9763,12 @@ serve-static@1.15.0:
 
 set-blocking@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
+  resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
 set-value@^2.0.0, set-value@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  resolved "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz"
   integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
   dependencies:
     extend-shallow "^2.0.1"
@@ -9232,41 +9778,41 @@ set-value@^2.0.0, set-value@^2.0.1:
 
 setimmediate@^1.0.4:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
+  resolved "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"
   integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
 
 setprototypeof@1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
 setprototypeof@1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
+  resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
 shallow-clone@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+  resolved "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz"
   integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
   dependencies:
     kind-of "^6.0.2"
 
 shebang-command@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
   integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
   dependencies:
     shebang-regex "^3.0.0"
 
 shebang-regex@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 side-channel@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"
   integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
   dependencies:
     call-bind "^1.0.0"
@@ -9275,17 +9821,17 @@ side-channel@^1.0.4:
 
 sigmund@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
+  resolved "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
   integrity sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==
 
-signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
+signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
 sinon@^13.0.1:
   version "13.0.2"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-13.0.2.tgz#c6a8ddd655dc1415bbdc5ebf0e5b287806850c3a"
+  resolved "https://registry.npmjs.org/sinon/-/sinon-13.0.2.tgz"
   integrity sha512-KvOrztAVqzSJWMDoxM4vM+GPys1df2VBoXm+YciyB/OLMamfS3VXh3oGh5WtrAGSzrgczNWFFY22oKb7Fi5eeA==
   dependencies:
     "@sinonjs/commons" "^1.8.3"
@@ -9297,22 +9843,22 @@ sinon@^13.0.1:
 
 sisteransi@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
+  resolved "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz"
   integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==
 
 slash@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
 slugify@^1.6.5:
   version "1.6.5"
-  resolved "https://registry.yarnpkg.com/slugify/-/slugify-1.6.5.tgz#c8f5c072bf2135b80703589b39a3d41451fbe8c8"
+  resolved "https://registry.npmjs.org/slugify/-/slugify-1.6.5.tgz"
   integrity sha512-8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ==
 
 snake-case@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-3.0.4.tgz#4f2bbd568e9935abdfd593f34c691dadb49c452c"
+  resolved "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz"
   integrity sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==
   dependencies:
     dot-case "^3.0.4"
@@ -9320,7 +9866,7 @@ snake-case@^3.0.4:
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  resolved "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"
   integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
   dependencies:
     define-property "^1.0.0"
@@ -9329,14 +9875,14 @@ snapdragon-node@^2.0.1:
 
 snapdragon-util@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  resolved "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"
   integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
   dependencies:
     kind-of "^3.2.0"
 
 snapdragon@^0.8.1:
   version "0.8.2"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  resolved "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"
   integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
   dependencies:
     base "^0.11.1"
@@ -9350,12 +9896,12 @@ snapdragon@^0.8.1:
 
 socket.io-adapter@~2.4.0:
   version "2.4.0"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz#b50a4a9ecdd00c34d4c8c808224daa1a786152a6"
+  resolved "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.4.0.tgz"
   integrity sha512-W4N+o69rkMEGVuk2D/cvca3uYsvGlMwsySWV447y99gUPghxq42BxqLNMndb+a1mm/5/7NeXVQS7RLa2XyXvYg==
 
 socket.io-parser@~4.0.4:
   version "4.0.5"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.5.tgz#cb404382c32324cc962f27f3a44058cf6e0552df"
+  resolved "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.0.5.tgz"
   integrity sha512-sNjbT9dX63nqUFIOv95tTVm6elyIU4RvB1m8dOeZt+IgWwcWklFDOdmGcfo3zSiRsnR/3pJkjY5lfoGqEe4Eig==
   dependencies:
     "@types/component-emitter" "^1.2.10"
@@ -9364,7 +9910,7 @@ socket.io-parser@~4.0.4:
 
 socket.io@^4.4.1:
   version "4.5.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.5.1.tgz#aa7e73f8a6ce20ee3c54b2446d321bbb6b1a9029"
+  resolved "https://registry.npmjs.org/socket.io/-/socket.io-4.5.1.tgz"
   integrity sha512-0y9pnIso5a9i+lJmsCdtmTTgJFFSvNQKDnPQRz28mGNnxbmqYg2QPtJTLFxhymFZhAIn50eHAKzJeiNaKr+yUQ==
   dependencies:
     accepts "~1.3.4"
@@ -9376,7 +9922,7 @@ socket.io@^4.4.1:
 
 sockjs@^0.3.24:
   version "0.3.24"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce"
+  resolved "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz"
   integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==
   dependencies:
     faye-websocket "^0.11.3"
@@ -9385,17 +9931,17 @@ sockjs@^0.3.24:
 
 sortablejs@1.10.2:
   version "1.10.2"
-  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.10.2.tgz#6e40364d913f98b85a14f6678f92b5c1221f5290"
+  resolved "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz"
   integrity sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A==
 
 "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
 source-map-resolve@^0.5.0:
   version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
+  resolved "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz"
   integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
   dependencies:
     atob "^2.1.2"
@@ -9404,9 +9950,17 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.6, source-map-support@~0.5.20:
+source-map-support@0.5.13:
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-support@~0.5.20:
   version "0.5.21"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
   dependencies:
     buffer-from "^1.0.0"
@@ -9414,37 +9968,32 @@ source-map-support@^0.5.6, source-map-support@~0.5.20:
 
 source-map-url@^0.4.0:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
+  resolved "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz"
   integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
 source-map@0.5.6:
   version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
   integrity sha512-MjZkVp0NHr5+TPihLcadqnlVoGIoWo4IBHptutGh9wI3ttUYvCG26HkSuDi+K6lsZ25syXJXcctwgyVCt//xqA==
 
 source-map@^0.5.6:
   version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
   integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
 source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@^0.7.3:
-  version "0.7.4"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.4.tgz#a9bbe705c9d8846f4e08ff6765acf0f1b0898656"
-  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
-
 sparkles@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
+  resolved "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz"
   integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
 
 spdx-correct@^3.0.0:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"
+  resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"
   integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
   dependencies:
     spdx-expression-parse "^3.0.0"
@@ -9452,12 +10001,12 @@ spdx-correct@^3.0.0:
 
 spdx-exceptions@^2.1.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  resolved "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"
   integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
 
 spdx-expression-parse@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  resolved "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"
   integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
     spdx-exceptions "^2.1.0"
@@ -9465,12 +10014,12 @@ spdx-expression-parse@^3.0.0:
 
 spdx-license-ids@^3.0.0:
   version "3.0.11"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
+  resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"
   integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
+  resolved "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"
   integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
   dependencies:
     debug "^4.1.0"
@@ -9482,7 +10031,7 @@ spdy-transport@^3.0.0:
 
 spdy@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
+  resolved "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz"
   integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
   dependencies:
     debug "^4.1.0"
@@ -9493,51 +10042,51 @@ spdy@^4.0.2:
 
 split-string@^3.0.1, split-string@^3.0.2:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  resolved "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"
   integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
   dependencies:
     extend-shallow "^3.0.0"
 
 splitpanes@2.3.8:
   version "2.3.8"
-  resolved "https://registry.yarnpkg.com/splitpanes/-/splitpanes-2.3.8.tgz#371655e5c8c6356d76bbf2f6f22d5564927b5bb4"
+  resolved "https://registry.npmjs.org/splitpanes/-/splitpanes-2.3.8.tgz"
   integrity sha512-eM/qZ1v7U5BMV8FQR7oeqVlllz3sTGTm0//g/eJMa0hZ4s+A1VK68j26FWzcaVlw2P5+dCXk7/X6ZRjjwcbrgw==
 
 sprintf-js@~1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
   integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
 stable@^0.1.8:
   version "0.1.8"
-  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
+  resolved "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz"
   integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
 stack-trace@0.0.10:
   version "0.0.10"
-  resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
+  resolved "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"
   integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==
 
 stack-utils@^2.0.3:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/stack-utils/-/stack-utils-2.0.5.tgz#d25265fca995154659dbbfba3b49254778d2fdd5"
+  resolved "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.5.tgz"
   integrity sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==
   dependencies:
     escape-string-regexp "^2.0.0"
 
 stackblur-canvas@^2.0.0:
   version "2.5.0"
-  resolved "https://registry.yarnpkg.com/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz#aa87bbed1560fdcd3138fff344fc6a1c413ebac4"
+  resolved "https://registry.npmjs.org/stackblur-canvas/-/stackblur-canvas-2.5.0.tgz"
   integrity sha512-EeNzTVfj+1In7aSLPKDD03F/ly4RxEuF/EX0YcOG0cKoPXs+SLZxDawQbexQDBzwROs4VKLWTOaZQlZkGBFEIQ==
 
 stackframe@^1.3.4:
   version "1.3.4"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.3.4.tgz#b881a004c8c149a5e8efef37d51b16e412943310"
+  resolved "https://registry.npmjs.org/stackframe/-/stackframe-1.3.4.tgz"
   integrity sha512-oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==
 
 stacktrace-gps@^3.0.2:
   version "3.1.2"
-  resolved "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz#0c40b24a9b119b20da4525c398795338966a2fb0"
+  resolved "https://registry.npmjs.org/stacktrace-gps/-/stacktrace-gps-3.1.2.tgz"
   integrity sha512-GcUgbO4Jsqqg6RxfyTHFiPxdPqF+3LFmQhm7MgCuYQOYuWyqxo5pwRPz5d/u6/WYJdEnWfK4r+jGbyD8TSggXQ==
   dependencies:
     source-map "0.5.6"
@@ -9545,7 +10094,7 @@ stacktrace-gps@^3.0.2:
 
 static-extend@^0.1.1:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  resolved "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"
   integrity sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==
   dependencies:
     define-property "^0.2.5"
@@ -9553,22 +10102,22 @@ static-extend@^0.1.1:
 
 statuses@2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
+  resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"
   integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
 
 "statuses@>= 1.4.0 < 2", statuses@~1.5.0:
   version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  resolved "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
 store@^2.0.12:
   version "2.0.12"
-  resolved "https://registry.yarnpkg.com/store/-/store-2.0.12.tgz#8c534e2a0b831f72b75fc5f1119857c44ef5d593"
+  resolved "https://registry.npmjs.org/store/-/store-2.0.12.tgz"
   integrity sha512-eO9xlzDpXLiMr9W1nQ3Nfp9EzZieIQc10zPPMP5jsVV7bLOziSFFBP0XoDXACEIFtdI+rIz0NwWVA/QVJ8zJtw==
 
 stream-browserify@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-3.0.0.tgz#22b0a2850cdf6503e73085da1fc7b7d0c2122f2f"
+  resolved "https://registry.npmjs.org/stream-browserify/-/stream-browserify-3.0.0.tgz"
   integrity sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==
   dependencies:
     inherits "~2.0.4"
@@ -9576,17 +10125,17 @@ stream-browserify@^3.0.0:
 
 stream-exhaust@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d"
+  resolved "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz"
   integrity sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==
 
 stream-shift@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
+  resolved "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"
   integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
 
 streamroller@^3.1.2:
   version "3.1.2"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.2.tgz#abd444560768b340f696307cf84d3f46e86c0e63"
+  resolved "https://registry.npmjs.org/streamroller/-/streamroller-3.1.2.tgz"
   integrity sha512-wZswqzbgGGsXYIrBYhOE0yP+nQ6XRk7xDcYwuQAGTYXdyAUmvgVFE0YU1g5pvQT0m7GBaQfYcSnlHbapuK0H0A==
   dependencies:
     date-format "^4.0.13"
@@ -9600,7 +10149,7 @@ streamsearch@^1.1.0:
 
 string-length@^4.0.1:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
+  resolved "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz"
   integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==
   dependencies:
     char-regex "^1.0.2"
@@ -9608,16 +10157,16 @@ string-length@^4.0.1:
 
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"
   integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw==
   dependencies:
     code-point-at "^1.0.0"
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^4.1.0, string-width@^4.2.0:
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
@@ -9626,7 +10175,7 @@ string-width@^4.1.0, string-width@^4.2.0:
 
 string.prototype.trimend@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz#914a65baaab25fbdd4ee291ca7dde57e869cb8d0"
+  resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.5.tgz"
   integrity sha512-I7RGvmjV4pJ7O3kdf+LXFpVfdNOxtCW/2C8f6jNiW4+PQchwxkCDzlk1/7p+Wl4bqFIZeF47qAHXLuHHWKAxog==
   dependencies:
     call-bind "^1.0.2"
@@ -9635,7 +10184,7 @@ string.prototype.trimend@^1.0.5:
 
 string.prototype.trimstart@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz#5466d93ba58cfa2134839f81d7f42437e8c01fef"
+  resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.5.tgz"
   integrity sha512-THx16TJCGlsN0o6dl2o6ncWUsdgnLRSA23rRE5pyGBw/mLr3Ej/R2LaqCtgP8VNMGZsvMWnf9ooZPyY2bHvUFg==
   dependencies:
     call-bind "^1.0.2"
@@ -9644,35 +10193,35 @@ string.prototype.trimstart@^1.0.5:
 
 string_decoder@^1.1.1:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
   integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
   dependencies:
     safe-buffer "~5.2.0"
 
 string_decoder@~1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
   integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
 strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
   integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
     ansi-regex "^5.0.1"
 
 strip-bom@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"
   integrity sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==
   dependencies:
     is-utf8 "^0.2.0"
@@ -9684,22 +10233,22 @@ strip-bom@^3.0.0:
 
 strip-bom@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878"
+  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz"
   integrity sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==
 
 strip-comments@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-comments/-/strip-comments-2.0.1.tgz#4ad11c3fbcac177a67a40ac224ca339ca1c1ba9b"
+  resolved "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz"
   integrity sha512-ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw==
 
 strip-final-newline@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
 strip-indent@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
+  resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz"
   integrity sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==
   dependencies:
     min-indent "^1.0.0"
@@ -9711,17 +10260,17 @@ strip-json-comments@^2.0.0:
 
 strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
 style-loader@^3.3.1:
   version "3.3.1"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.1.tgz#057dfa6b3d4d7c7064462830f9113ed417d38575"
+  resolved "https://registry.npmjs.org/style-loader/-/style-loader-3.3.1.tgz"
   integrity sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==
 
 stylehacks@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.0.tgz#a40066490ca0caca04e96c6b02153ddc39913520"
+  resolved "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz"
   integrity sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==
   dependencies:
     browserslist "^4.16.6"
@@ -9729,46 +10278,38 @@ stylehacks@^5.1.0:
 
 supports-color@^5.3.0:
   version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0, supports-color@^7.1.0, supports-color@^7.2.0:
+supports-color@^7.1.0, supports-color@^7.2.0:
   version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
 supports-color@^8.0.0:
   version "8.1.1"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
   dependencies:
     has-flag "^4.0.0"
 
 supports-color@^9.2.3:
-  version "9.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-9.2.3.tgz#a6e2c97fc20c80abecd69e50aebe4783ff77d45a"
-  integrity sha512-aszYUX/DVK/ed5rFLb/dDinVJrQjG/vmU433wtqVSD800rYsJNWxh2R3USV90aLSU+UsyQkbNeffVLzc6B6foA==
-
-supports-hyperlinks@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"
-  integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==
-  dependencies:
-    has-flag "^4.0.0"
-    supports-color "^7.0.0"
+  version "9.3.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-9.3.0.tgz#cce566c5ad562eece4dfe5a4502a58efc54986a9"
+  integrity sha512-hJ6RYjNbcBFkpHi+ykjar+7GgHs+65Kxyw940nBLOSjaWZ13acq4A5f+gWiV5w+xfsg5MbnjDxTigLcUuljerw==
 
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
 sver-compat@^1.5.0:
   version "1.5.0"
-  resolved "https://registry.yarnpkg.com/sver-compat/-/sver-compat-1.5.0.tgz#3cf87dfeb4d07b4a3f14827bc186b3fd0c645cd8"
+  resolved "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz"
   integrity sha512-aFTHfmjwizMNlNE6dsGmoAM4lHjL0CyiobWaFiXWSlD7cIxshW422Nb8KbXCmR6z+0ZEPY+daXJrDyh/vuwTyg==
   dependencies:
     es6-iterator "^2.0.1"
@@ -9776,12 +10317,12 @@ sver-compat@^1.5.0:
 
 svg-pathdata@^6.0.3:
   version "6.0.3"
-  resolved "https://registry.yarnpkg.com/svg-pathdata/-/svg-pathdata-6.0.3.tgz#80b0e0283b652ccbafb69ad4f8f73e8d3fbf2cac"
+  resolved "https://registry.npmjs.org/svg-pathdata/-/svg-pathdata-6.0.3.tgz"
   integrity sha512-qsjeeq5YjBZ5eMdFuUa4ZosMLxgr5RZ+F+Y1OrDhuOCEInRMA3x74XdBtggJcj9kOeInz0WE+LgCPDkZFlBYJw==
 
 svgo@^2.7.0:
   version "2.8.0"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24"
+  resolved "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz"
   integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==
   dependencies:
     "@trysound/sax" "0.2.0"
@@ -9794,12 +10335,12 @@ svgo@^2.7.0:
 
 symbol-tree@^3.2.4:
   version "3.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
 sync-fetch@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/sync-fetch/-/sync-fetch-0.4.1.tgz#87b8684eef2fa25c96c4683ae308473a4e5c571f"
+  resolved "https://registry.npmjs.org/sync-fetch/-/sync-fetch-0.4.1.tgz"
   integrity sha512-JDtyFEvnKUzt1CxRtzzsGgkBanEv8XRmLyJo0F0nGkpCR8EjYmpOJJXz8GA/SWtlPU0nAYh0+CNMNnFworGyOA==
   dependencies:
     buffer "^5.7.1"
@@ -9807,20 +10348,12 @@ sync-fetch@^0.4.1:
 
 tapable@^2.1.1, tapable@^2.2.0:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
+  resolved "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-terminal-link@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994"
-  integrity sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==
-  dependencies:
-    ansi-escapes "^4.2.1"
-    supports-hyperlinks "^2.0.0"
-
 terser-webpack-plugin@^5.1.3:
   version "5.3.3"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz#8033db876dd5875487213e87c627bca323e5ed90"
+  resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.3.tgz"
   integrity sha512-Fx60G5HNYknNTNQnzQ1VePRuu89ZVYWfjRAeT5rITuCY/1b08s49e5kSQwHDirKZWuoKOBRFS98EUUoZ9kLEwQ==
   dependencies:
     "@jridgewell/trace-mapping" "^0.3.7"
@@ -9831,7 +10364,7 @@ terser-webpack-plugin@^5.1.3:
 
 terser@^5.7.2:
   version "5.14.2"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10"
+  resolved "https://registry.npmjs.org/terser/-/terser-5.14.2.tgz"
   integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==
   dependencies:
     "@jridgewell/source-map" "^0.3.2"
@@ -9841,7 +10374,7 @@ terser@^5.7.2:
 
 test-exclude@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+  resolved "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz"
   integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
   dependencies:
     "@istanbuljs/schema" "^0.1.2"
@@ -9850,24 +10383,19 @@ test-exclude@^6.0.0:
 
 text-segmentation@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/text-segmentation/-/text-segmentation-1.0.3.tgz#52a388159efffe746b24a63ba311b6ac9f2d7943"
+  resolved "https://registry.npmjs.org/text-segmentation/-/text-segmentation-1.0.3.tgz"
   integrity sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==
   dependencies:
     utrie "^1.0.2"
 
 text-table@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
   integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
-throat@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/throat/-/throat-6.0.1.tgz#d514fedad95740c12c2d7fc70ea863eb51ade375"
-  integrity sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==
-
 through2-filter@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
+  resolved "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz"
   integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
   dependencies:
     through2 "~2.0.0"
@@ -9875,7 +10403,7 @@ through2-filter@^3.0.0:
 
 through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
+  resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
   dependencies:
     readable-stream "~2.3.6"
@@ -9883,24 +10411,24 @@ through2@^2.0.0, through2@^2.0.3, through2@~2.0.0:
 
 thunky@^1.0.2:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
+  resolved "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"
   integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
 time-stamp@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
+  resolved "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz"
   integrity sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==
 
 timers-browserify@^2.0.12:
   version "2.0.12"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
+  resolved "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz"
   integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
   dependencies:
     setimmediate "^1.0.4"
 
 tiny-glob@0.2.9:
   version "0.2.9"
-  resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.9.tgz#2212d441ac17928033b110f8b3640683129d31e2"
+  resolved "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz"
   integrity sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==
   dependencies:
     globalyzer "0.1.0"
@@ -9908,19 +10436,19 @@ tiny-glob@0.2.9:
 
 tmp@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz"
   integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
   dependencies:
     rimraf "^3.0.0"
 
 tmpl@1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc"
+  resolved "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz"
   integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==
 
 to-absolute-glob@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz#1865f43d9e74b0822db9f145b78cff7d0f7c849b"
+  resolved "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz"
   integrity sha512-rtwLUQEwT8ZeKQbyFJyomBRYXyE16U5VKuy0ftxLMK/PZb2fkOsg5r9kHdauuVDbsNdIBoC/HCthpidamQFXYA==
   dependencies:
     is-absolute "^1.0.0"
@@ -9928,19 +10456,19 @@ to-absolute-glob@^2.0.0:
 
 to-fast-properties@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
+  resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
   integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-object-path@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
+  resolved "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"
   integrity sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==
   dependencies:
     kind-of "^3.0.2"
 
 to-regex-range@^2.1.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"
   integrity sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==
   dependencies:
     is-number "^3.0.0"
@@ -9948,14 +10476,14 @@ to-regex-range@^2.1.0:
 
 to-regex-range@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
   integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
   dependencies:
     is-number "^7.0.0"
 
 to-regex@^3.0.1, to-regex@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  resolved "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"
   integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
   dependencies:
     define-property "^2.0.2"
@@ -9965,42 +10493,43 @@ to-regex@^3.0.1, to-regex@^3.0.2:
 
 to-through@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-through/-/to-through-2.0.0.tgz#fc92adaba072647bc0b67d6b03664aa195093af6"
+  resolved "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz"
   integrity sha512-+QIz37Ly7acM4EMdw2PRN389OneM5+d844tirkGp4dPKzI5OE72V9OsbFp+CIYJDahZ41ZV05hNtcPAQUAm9/Q==
   dependencies:
     through2 "^2.0.3"
 
 toastr@^2.1.4:
   version "2.1.4"
-  resolved "https://registry.yarnpkg.com/toastr/-/toastr-2.1.4.tgz#8b43be64fb9d0c414871446f2db8e8ca4e95f181"
+  resolved "https://registry.npmjs.org/toastr/-/toastr-2.1.4.tgz"
   integrity sha512-LIy77F5n+sz4tefMmFOntcJ6HL0Fv3k1TDnNmFZ0bU/GcvIIfy6eG2v7zQmMiYgaalAiUv75ttFrPn5s0gyqlA==
   dependencies:
     jquery ">=1.12.0"
 
 toidentifier@1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
+  resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"
   integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
-tough-cookie@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
-  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+tough-cookie@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
+  integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
-    universalify "^0.1.2"
+    universalify "^0.2.0"
+    url-parse "^1.5.3"
 
-tr46@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
-  integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
+tr46@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
+  integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
   dependencies:
     punycode "^2.1.1"
 
 tr46@~0.0.3:
   version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
+  resolved "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"
   integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
 ts-jest@^29.0.3:
@@ -10027,6 +10556,24 @@ ts-loader@^9.4.1:
     micromatch "^4.0.0"
     semver "^7.3.4"
 
+tsconfig-paths-webpack-plugin@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.0.0.tgz#84008fc3e3e0658fdb0262758b07b4da6265ff1a"
+  integrity sha512-fw/7265mIWukrSHd0i+wSwx64kYUSAKPfxRDksjKIYTxSAp9W9/xcZVBF4Kl0eqQd5eBpAQ/oQrc5RyM/0c1GQ==
+  dependencies:
+    chalk "^4.1.0"
+    enhanced-resolve "^5.7.0"
+    tsconfig-paths "^4.0.0"
+
+tsconfig-paths@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.1.1.tgz#7f23094ce897fcf4a93f67c4776e813003e48b75"
+  integrity sha512-VgPrtLKpRgEAJsMj5Q/I/mXouC6A/7eJ/X4Nuk6o0cRPwBtznYxTCU4FodbexbzH9somBPEXYi0ZkUViUpJ21Q==
+  dependencies:
+    json5 "^2.2.1"
+    minimist "^1.2.6"
+    strip-bom "^3.0.0"
+
 tsconfig@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/tsconfig/-/tsconfig-7.0.0.tgz#84538875a4dc216e5c4a5432b3a4dec3d54e91b7"
@@ -10039,12 +10586,12 @@ tsconfig@^7.0.0:
 
 tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
 tslib@^2.0.3, tslib@^2.1.0:
   version "2.4.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
+  resolved "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz"
   integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
 
 tsutils@^3.21.0:
@@ -10056,7 +10603,7 @@ tsutils@^3.21.0:
 
 tus-js-client@^2.3.0:
   version "2.3.2"
-  resolved "https://registry.yarnpkg.com/tus-js-client/-/tus-js-client-2.3.2.tgz#ec7007cf0d9a1eecf57977b7a015404c5e9cb2a6"
+  resolved "https://registry.npmjs.org/tus-js-client/-/tus-js-client-2.3.2.tgz"
   integrity sha512-5a2rm7gp+G7Z+ZB0AO4PzD/dwczB3n1fZeWO5W8AWLJ12RRk1rY4Aeb2VAYX9oKGE+/rGPrdxoFPA/vDSVKnpg==
   dependencies:
     buffer-from "^1.1.2"
@@ -10069,36 +10616,36 @@ tus-js-client@^2.3.0:
 
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"
   integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
   dependencies:
     prelude-ls "^1.2.1"
 
 type-check@~0.3.2:
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  resolved "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"
   integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
   dependencies:
     prelude-ls "~1.1.2"
 
 type-detect@4.0.8, type-detect@^4.0.8:
   version "4.0.8"
-  resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
+  resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz"
   integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==
 
 type-fest@^0.20.2:
   version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
 type-fest@^0.21.3:
   version "0.21.3"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
 type-is@~1.6.18:
   version "1.6.18"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"
   integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
   dependencies:
     media-typer "0.3.0"
@@ -10106,24 +10653,17 @@ type-is@~1.6.18:
 
 type@^1.0.1:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
+  resolved "https://registry.npmjs.org/type/-/type-1.2.0.tgz"
   integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
 
 type@^2.5.0:
   version "2.7.2"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
+  resolved "https://registry.npmjs.org/type/-/type-2.7.2.tgz"
   integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
 
-typedarray-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
-  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
-  dependencies:
-    is-typedarray "^1.0.0"
-
 typedarray@^0.0.6:
   version "0.0.6"
-  resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
+  resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
   integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==
 
 typescript-eslint@^0.0.1-alpha.0:
@@ -10138,17 +10678,17 @@ typescript@^4.9.3:
 
 ua-parser-js@^0.7.30:
   version "0.7.31"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6"
+  resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.31.tgz"
   integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
+  resolved "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz"
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
 unbox-primitive@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e"
+  resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"
   integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
   dependencies:
     call-bind "^1.0.2"
@@ -10158,22 +10698,22 @@ unbox-primitive@^1.0.2:
 
 unc-path-regex@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  resolved "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"
   integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==
 
 underscore@>=1.8.3, underscore@^1.13.2:
   version "1.13.4"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.13.4.tgz#7886b46bbdf07f768e0052f1828e1dcab40c0dee"
+  resolved "https://registry.npmjs.org/underscore/-/underscore-1.13.4.tgz"
   integrity sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ==
 
 undertaker-registry@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50"
+  resolved "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz"
   integrity sha512-UR1khWeAjugW3548EfQmL9Z7pGMlBgXteQpr1IZeZBtnkCJQJIJ1Scj0mb9wQaPvUZ9Q17XqW6TIaPchJkyfqw==
 
 undertaker@^1.2.1:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-1.3.0.tgz#363a6e541f27954d5791d6fa3c1d321666f86d18"
+  resolved "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz"
   integrity sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==
   dependencies:
     arr-flatten "^1.0.1"
@@ -10188,20 +10728,20 @@ undertaker@^1.2.1:
     undertaker-registry "^1.0.0"
 
 undici@^5.12.0:
-  version "5.13.0"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.13.0.tgz#56772fba89d8b25e39bddc8c26a438bd73ea69bb"
-  integrity sha512-UDZKtwb2k7KRsK4SdXWG7ErXiL7yTGgLWvk2AXO1JMjgjh404nFo6tWSCM2xMpJwMPx3J8i/vfqEh1zOqvj82Q==
+  version "5.14.0"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.14.0.tgz#1169d0cdee06a4ffdd30810f6228d57998884d00"
+  integrity sha512-yJlHYw6yXPPsuOH0x2Ib1Km61vu4hLiRRQoafs+WUgX1vO64vgnxiCEN9dpIrhZyHFsai3F0AEj4P9zy19enEQ==
   dependencies:
     busboy "^1.6.0"
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
+  resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"
   integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
 
 unicode-match-property-ecmascript@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+  resolved "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"
   integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
   dependencies:
     unicode-canonical-property-names-ecmascript "^2.0.0"
@@ -10209,17 +10749,22 @@ unicode-match-property-ecmascript@^2.0.0:
 
 unicode-match-property-value-ecmascript@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
+  resolved "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz"
   integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
 
+unicode-match-property-value-ecmascript@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz#cb5fffdcd16a05124f5a4b0bf7c3770208acbbe0"
+  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
+
 unicode-property-aliases-ecmascript@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
+  resolved "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz"
   integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
 
 union-value@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  resolved "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz"
   integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
   dependencies:
     arr-union "^3.1.0"
@@ -10229,25 +10774,30 @@ union-value@^1.0.0:
 
 unique-stream@^2.0.2:
   version "2.3.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
+  resolved "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz"
   integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
   dependencies:
     json-stable-stringify-without-jsonify "^1.0.1"
     through2-filter "^3.0.0"
 
-universalify@^0.1.0, universalify@^0.1.2:
+universalify@^0.1.0:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.2.0.tgz#6451760566fa857534745ab1dde952d1b1761be0"
+  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
 unset-value@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  resolved "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"
   integrity sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==
   dependencies:
     has-value "^0.3.1"
@@ -10255,27 +10805,35 @@ unset-value@^1.0.0:
 
 update-browserslist-db@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz#be06a5eedd62f107b7c19eb5bcefb194411abf38"
+  resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz"
   integrity sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==
   dependencies:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
+update-browserslist-db@^1.0.9:
+  version "1.0.10"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz#0f54b876545726f17d00cd9a2561e6dade943ff3"
+  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
 uri-js@^4.2.2:
   version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"
   integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
 urix@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  resolved "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"
   integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==
 
-url-parse@^1.5.7:
+url-parse@^1.5.3, url-parse@^1.5.7:
   version "1.5.10"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  resolved "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz"
   integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
   dependencies:
     querystringify "^2.1.1"
@@ -10283,17 +10841,17 @@ url-parse@^1.5.7:
 
 use@^3.1.0:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  resolved "https://registry.npmjs.org/use/-/use-3.1.1.tgz"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 util@^0.12.0, util@^0.12.4:
   version "0.12.4"
-  resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253"
+  resolved "https://registry.npmjs.org/util/-/util-0.12.4.tgz"
   integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==
   dependencies:
     inherits "^2.0.3"
@@ -10305,40 +10863,40 @@ util@^0.12.0, util@^0.12.4:
 
 utils-merge@1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
 utrie@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/utrie/-/utrie-1.0.2.tgz#d42fe44de9bc0119c25de7f564a6ed1b2c87a645"
+  resolved "https://registry.npmjs.org/utrie/-/utrie-1.0.2.tgz"
   integrity sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==
   dependencies:
     base64-arraybuffer "^1.0.2"
 
 uuid@^8.3.2:
   version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-v8-to-istanbul@^8.1.0:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz#77b752fd3975e31bbcef938f85e9bd1c7a8d60ed"
-  integrity sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==
+v8-to-istanbul@^9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-9.0.1.tgz#b6f994b0b5d4ef255e17a0d17dc444a9f5132fa4"
+  integrity sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.12"
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
-    source-map "^0.7.3"
 
 v8flags@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-3.2.0.tgz#b243e3b4dfd731fa774e7492128109a0fe66d656"
+  resolved "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz"
   integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==
   dependencies:
     homedir-polyfill "^1.0.1"
 
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
+  resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"
   integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
     spdx-correct "^3.0.0"
@@ -10346,17 +10904,17 @@ validate-npm-package-license@^3.0.1:
 
 value-or-function@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-3.0.0.tgz#1c243a50b595c1be54a754bfece8563b9ff8d813"
+  resolved "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz"
   integrity sha512-jdBB2FrWvQC/pnPtIqcLsMaQgjhdb6B7tk1MMyTKapox+tQZbdRP4uLxu/JY0t7fbfDCUMnuelzEYv5GsxHhdg==
 
 vary@^1, vary@~1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
 vinyl-fs@^3.0.0:
   version "3.0.3"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7"
+  resolved "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz"
   integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==
   dependencies:
     fs-mkdirp-stream "^1.0.0"
@@ -10379,7 +10937,7 @@ vinyl-fs@^3.0.0:
 
 vinyl-sourcemap@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz#92a800593a38703a8cdb11d8b300ad4be63b3e16"
+  resolved "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz"
   integrity sha512-NiibMgt6VJGJmyw7vtzhctDcfKch4e4n9TBeoWlirb7FMg9/1Ov9k+A5ZRAtywBpRPiyECvQRQllYM8dECegVA==
   dependencies:
     append-buffer "^1.0.2"
@@ -10392,7 +10950,7 @@ vinyl-sourcemap@^1.1.0:
 
 vinyl@^2.0.0:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
+  resolved "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz"
   integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
   dependencies:
     clone "^2.1.1"
@@ -10404,17 +10962,17 @@ vinyl@^2.0.0:
 
 void-elements@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+  resolved "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"
   integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==
 
 vue-demi@*:
-  version "0.13.6"
-  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.6.tgz#f9433cbd75e68a970dec066647f4ba6c08ced48f"
-  integrity sha512-02NYpxgyGE2kKGegRPYlNQSL1UWfA/+JqvzhGCOYjhfbLWXU5QQX0+9pAm/R2sCOPKr5NBxVIab7fvFU0B1RxQ==
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/vue-demi/-/vue-demi-0.13.11.tgz#7d90369bdae8974d87b1973564ad390182410d99"
+  integrity sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==
 
 vue-eslint-parser@^9.0.1:
   version "9.0.3"
-  resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-9.0.3.tgz#0c17a89e0932cc94fa6a79f0726697e13bfe3c96"
+  resolved "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.0.3.tgz"
   integrity sha512-yL+ZDb+9T0ELG4VIFo/2anAOz8SvBdlqEnQnvJ3M7Scq56DvtjY0VY88bByRZB0D4J0u8olBcfrXTVONXsh4og==
   dependencies:
     debug "^4.3.4"
@@ -10427,17 +10985,17 @@ vue-eslint-parser@^9.0.1:
 
 vue-functional-data-merge@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/vue-functional-data-merge/-/vue-functional-data-merge-3.1.0.tgz#08a7797583b7f35680587f8a1d51d729aa1dc657"
+  resolved "https://registry.npmjs.org/vue-functional-data-merge/-/vue-functional-data-merge-3.1.0.tgz"
   integrity sha512-leT4kdJVQyeZNY1kmnS1xiUlQ9z1B/kdBFCILIjYYQDqZgLqCLa0UhjSSeRX6c3mUe6U5qYeM8LrEqkHJ1B4LA==
 
 vue-hot-reload-api@^2.3.0:
   version "2.3.4"
-  resolved "https://registry.yarnpkg.com/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2"
+  resolved "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz"
   integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
 
 vue-infinite-scroll@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/vue-infinite-scroll/-/vue-infinite-scroll-2.0.2.tgz#ca37a91fe92ee0ad3b74acf8682c00917144b711"
+  resolved "https://registry.npmjs.org/vue-infinite-scroll/-/vue-infinite-scroll-2.0.2.tgz"
   integrity sha512-n+YghR059YmciANGJh9SsNWRi1YZEBVlODtmnb/12zI+4R72QZSWd+EuZ5mW6auEo/yaJXgxzwsuhvALVnm73A==
 
 vue-loader@15.10.0, vue-loader@^15.10.0:
@@ -10453,17 +11011,17 @@ vue-loader@15.10.0, vue-loader@^15.10.0:
 
 vue-multiselect@^2.1.6:
   version "2.1.6"
-  resolved "https://registry.yarnpkg.com/vue-multiselect/-/vue-multiselect-2.1.6.tgz#5be5d811a224804a15c43a4edbb7485028a89c7f"
+  resolved "https://registry.npmjs.org/vue-multiselect/-/vue-multiselect-2.1.6.tgz"
   integrity sha512-s7jmZPlm9FeueJg1RwJtnE9KNPtME/7C8uRWSfp9/yEN4M8XcS/d+bddoyVwVnvFyRh9msFo0HWeW0vTL8Qv+w==
 
 vue-observe-visibility@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/vue-observe-visibility/-/vue-observe-visibility-1.0.0.tgz#17cf1b2caf74022f0f3c95371468ddf2b9573152"
+  resolved "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-1.0.0.tgz"
   integrity sha512-s5TFh3s3h3Mhd3jaz3zGzkVHKHnc/0C/gNr30olO99+yw2hl3WBhK3ng3/f9OF+qkW4+l7GkmwfAzDAcY3lCFg==
 
 vue-prismjs@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vue-prismjs/-/vue-prismjs-1.2.0.tgz#b137f5ed958685ce1fd55ca6b068289f3359b8b7"
+  resolved "https://registry.npmjs.org/vue-prismjs/-/vue-prismjs-1.2.0.tgz"
   integrity sha512-1mICbMknMiKw4mfM1AU7vkFT3VX4Cq8ySyDU7IBr9tYW1fzxIPkfLoERkRMbQLBc+J74K3FIiuuZ+WfBjO3SCQ==
   dependencies:
     prismjs "^1.6.0"
@@ -10475,12 +11033,12 @@ vue-router@^3.6.5:
 
 vue-rx@^6.2.0:
   version "6.2.0"
-  resolved "https://registry.yarnpkg.com/vue-rx/-/vue-rx-6.2.0.tgz#c3b86462b252626edd16417385bb9054a3a23acb"
+  resolved "https://registry.npmjs.org/vue-rx/-/vue-rx-6.2.0.tgz"
   integrity sha512-tpKUcqS5IUYS+HsdbR5TlE5LL9PK4zwlplEtmMeydnbqaUTa9ciLMplJXAtFSiQw1vuURoyEJmCXqMxaVEIloQ==
 
 vue-style-loader@^4.1.0:
   version "4.1.3"
-  resolved "https://registry.yarnpkg.com/vue-style-loader/-/vue-style-loader-4.1.3.tgz#6d55863a51fa757ab24e89d9371465072aa7bc35"
+  resolved "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz"
   integrity sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==
   dependencies:
     hash-sum "^1.0.2"
@@ -10488,21 +11046,21 @@ vue-style-loader@^4.1.0:
 
 vue-template-compiler@^2.7.8:
   version "2.7.8"
-  resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.8.tgz#eadd54ed8fbff55b7deb07093a976c07f451a1dc"
+  resolved "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.8.tgz"
   integrity sha512-eQqdcUpJKJpBRPDdxCNsqUoT0edNvdt1jFjtVnVS/LPPmr0BU2jWzXlrf6BVMeODtdLewB3j8j3WjNiB+V+giw==
   dependencies:
     de-indent "^1.0.2"
     he "^1.2.0"
 
-vue-template-es2015-compiler@^1.5.3, vue-template-es2015-compiler@^1.9.0:
+vue-template-es2015-compiler@^1.9.0:
   version "1.9.1"
-  resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz#1ee3bc9a16ecbf5118be334bb15f9c46f82f5825"
+  resolved "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz"
   integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
 
-vue-virtual-scroll-list@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-2.3.3.tgz#290f0d04be814b93585f2ef232097b671141e5b1"
-  integrity sha512-heuwlZ+lEdcVSp66CpVXnyNdsiHl/XU1cvqJb0yUHGlLv6DGK8OX16FH8I3w/wKNXtHSPF9itdBBGJFrXkyHeg==
+vue-virtual-scroll-list@^2.3.4:
+  version "2.3.4"
+  resolved "https://registry.yarnpkg.com/vue-virtual-scroll-list/-/vue-virtual-scroll-list-2.3.4.tgz#0d08c2d26299d8609018b8c04f5e3ca608fbe2d6"
+  integrity sha512-a9bmmIhAdnKcp8NG0C9ZQ+pW9nAOrDv5SHqJfbbEpXxVVERCtbIgGeBnkwrGgmoILBoFz/WANIZgA22G44F0Yw==
 
 vue@2.7.8, vue@^2.6.10, vue@^2.7.8:
   version "2.7.8"
@@ -10514,19 +11072,19 @@ vue@2.7.8, vue@^2.6.10, vue@^2.7.8:
 
 vuedraggable@2.24.3:
   version "2.24.3"
-  resolved "https://registry.yarnpkg.com/vuedraggable/-/vuedraggable-2.24.3.tgz#43c93849b746a24ce503e123d5b259c701ba0d19"
+  resolved "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz"
   integrity sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==
   dependencies:
     sortablejs "1.10.2"
 
 vuex-cache@^3.4.0:
   version "3.5.0"
-  resolved "https://registry.yarnpkg.com/vuex-cache/-/vuex-cache-3.5.0.tgz#ceba1e4b3ba16bc4067201dd17de392aa161a329"
+  resolved "https://registry.npmjs.org/vuex-cache/-/vuex-cache-3.5.0.tgz"
   integrity sha512-0KAcpFPlYUDMhoCqv2oJYmBIR8jt0ins0Ge2+OVvdrpPn46CCLltiI55cbKB5enEwFS3jfuXfNlcqPOCD5dBTA==
 
 vuex-persist@2.3:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/vuex-persist/-/vuex-persist-2.3.0.tgz#f3d21b6d631078667d6834f2f74442ee332ac281"
+  resolved "https://registry.npmjs.org/vuex-persist/-/vuex-persist-2.3.0.tgz"
   integrity sha512-0QPZQYgQ72SbXkdwctXGFQJhlRiySP0z9wHDBTlyHvNy3CneKvgyJ7Lfob8NUiYbaurJepaC+JFynwshp59FGA==
   dependencies:
     flatted "^2.0.0"
@@ -10534,33 +11092,26 @@ vuex-persist@2.3:
 
 vuex@^3.6.2:
   version "3.6.2"
-  resolved "https://registry.yarnpkg.com/vuex/-/vuex-3.6.2.tgz#236bc086a870c3ae79946f107f16de59d5895e71"
+  resolved "https://registry.npmjs.org/vuex/-/vuex-3.6.2.tgz"
   integrity sha512-ETW44IqCgBpVomy520DT5jf8n0zoCac+sxWnn+hMe/CzaSejb/eVw2YToiXYX+Ex/AuHHia28vWTq4goAexFbw==
 
-w3c-hr-time@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
-  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
+w3c-xmlserializer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz#aebdc84920d806222936e3cdce408e32488a3073"
+  integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
   dependencies:
-    browser-process-hrtime "^1.0.0"
+    xml-name-validator "^4.0.0"
 
-w3c-xmlserializer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
-  integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
-  dependencies:
-    xml-name-validator "^3.0.0"
-
-walker@^1.0.7, walker@^1.0.8:
+walker@^1.0.8:
   version "1.0.8"
-  resolved "https://registry.yarnpkg.com/walker/-/walker-1.0.8.tgz#bd498db477afe573dc04185f011d3ab8a8d7653f"
+  resolved "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz"
   integrity sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==
   dependencies:
     makeerror "1.0.12"
 
 watchpack@^2.4.0:
   version "2.4.0"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
+  resolved "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz"
   integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
   dependencies:
     glob-to-regexp "^0.4.1"
@@ -10568,29 +11119,24 @@ watchpack@^2.4.0:
 
 wbuf@^1.1.0, wbuf@^1.7.3:
   version "1.7.3"
-  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
+  resolved "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz"
   integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
   dependencies:
     minimalistic-assert "^1.0.0"
 
 webidl-conversions@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
+  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"
   integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
-webidl-conversions@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
-  integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
-
-webidl-conversions@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
-  integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
+webidl-conversions@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
+  integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
 webpack-cli@^4.10.0:
   version "4.10.0"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31"
+  resolved "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz"
   integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
@@ -10608,7 +11154,7 @@ webpack-cli@^4.10.0:
 
 webpack-dev-middleware@^5.3.1:
   version "5.3.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
+  resolved "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz"
   integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
   dependencies:
     colorette "^2.0.10"
@@ -10619,7 +11165,7 @@ webpack-dev-middleware@^5.3.1:
 
 webpack-dev-server@^4.9.3:
   version "4.10.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.10.0.tgz#de270d0009eba050546912be90116e7fd740a9ca"
+  resolved "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.10.0.tgz"
   integrity sha512-7dezwAs+k6yXVFZ+MaL8VnE+APobiO3zvpp3rBHe/HmWQ+avwh0Q3d0xxacOiBybZZ3syTZw9HXzpa3YNbAZDQ==
   dependencies:
     "@types/bonjour" "^3.5.9"
@@ -10654,14 +11200,14 @@ webpack-dev-server@^4.9.3:
 
 webpack-merge@^4.1.5:
   version "4.2.2"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
+  resolved "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz"
   integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
   dependencies:
     lodash "^4.17.15"
 
 webpack-merge@^5.7.3, webpack-merge@^5.8.0:
   version "5.8.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61"
+  resolved "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz"
   integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
   dependencies:
     clone-deep "^4.0.1"
@@ -10669,12 +11215,12 @@ webpack-merge@^5.7.3, webpack-merge@^5.8.0:
 
 webpack-sources@^3.2.3:
   version "3.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
+  resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
 "webpack@>=4.0.0 <6.0.0", webpack@^5.73.0:
   version "5.74.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.74.0.tgz#02a5dac19a17e0bb47093f2be67c695102a55980"
+  resolved "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz"
   integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
@@ -10704,7 +11250,7 @@ webpack-sources@^3.2.3:
 
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
+  resolved "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"
   integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
   dependencies:
     http-parser-js ">=0.5.1"
@@ -10713,41 +11259,40 @@ websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
 
 websocket-extensions@>=0.1.1:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  resolved "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz"
   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
-whatwg-encoding@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
-  integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
+whatwg-encoding@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
+  integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==
   dependencies:
-    iconv-lite "0.4.24"
+    iconv-lite "0.6.3"
 
-whatwg-mimetype@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
-  integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
+whatwg-mimetype@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
+  integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
+
+whatwg-url@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-11.0.0.tgz#0a849eebb5faf2119b901bb76fd795c2848d4018"
+  integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
+  dependencies:
+    tr46 "^3.0.0"
+    webidl-conversions "^7.0.0"
 
 whatwg-url@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
+  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"
   integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
-whatwg-url@^8.0.0, whatwg-url@^8.5.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
-  integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
-  dependencies:
-    lodash "^4.7.0"
-    tr46 "^2.1.0"
-    webidl-conversions "^6.1.0"
-
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
+  resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"
   integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
   dependencies:
     is-bigint "^1.0.1"
@@ -10768,12 +11313,12 @@ which-collection@^1.0.1:
 
 which-module@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
+  resolved "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"
   integrity sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==
 
 which-typed-array@^1.1.2:
   version "1.1.8"
-  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.8.tgz#0cfd53401a6f334d90ed1125754a42ed663eb01f"
+  resolved "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.8.tgz"
   integrity sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==
   dependencies:
     available-typed-arrays "^1.0.5"
@@ -10797,48 +11342,48 @@ which-typed-array@^1.1.8:
 
 which@^1.2.1, which@^1.2.14:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 which@^2.0.1:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
 wikibase-sdk@^8.0.1:
   version "8.0.1"
-  resolved "https://registry.yarnpkg.com/wikibase-sdk/-/wikibase-sdk-8.0.1.tgz#e711df333aa7ca6c92cf5d4258a4e692d3e3a765"
+  resolved "https://registry.npmjs.org/wikibase-sdk/-/wikibase-sdk-8.0.1.tgz"
   integrity sha512-UHhxfsg7yzUZBJ7aKbzmVRdioFYTBEsC3v35cJ0Bb3MxUNSmh/4VES7Os1VJG/RNn6bzfBBUXfuIIUFo36UuhA==
 
 wikidata-sdk@^8.0.0:
   version "8.0.1"
-  resolved "https://registry.yarnpkg.com/wikidata-sdk/-/wikidata-sdk-8.0.1.tgz#42f81e3a70e4243a4ce7ecc107cfc8248af1aa1c"
+  resolved "https://registry.npmjs.org/wikidata-sdk/-/wikidata-sdk-8.0.1.tgz"
   integrity sha512-V/xTI/v0vDo+a2wC20GxO0r3vX6RmNOSFJhdLZ9YQ+eUp4bq8xZSMeYjIuMwuuKtrNQURL2gVNIgLroCj9x2Bw==
   dependencies:
     wikibase-sdk "^8.0.1"
 
 wildcard@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
+  resolved "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz"
   integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
 
 winbox@^0.2.4:
   version "0.2.4"
-  resolved "https://registry.yarnpkg.com/winbox/-/winbox-0.2.4.tgz#b9cbb475e663e4d162ae4570e38238f78ccef205"
+  resolved "https://registry.npmjs.org/winbox/-/winbox-0.2.4.tgz"
   integrity sha512-roEuUNY6iCOT9gF7J86D7bG8EeeH3U5073iCnWi1fgK/vkHTxFB9RJb4XKV65Hbbi0MCEtmb8B9zxS8+iumuJA==
 
 word-wrap@^1.2.3, word-wrap@~1.2.3:
   version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
 wrap-ansi@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
+  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"
   integrity sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==
   dependencies:
     string-width "^1.0.1"
@@ -10846,7 +11391,7 @@ wrap-ansi@^2.0.0:
 
 wrap-ansi@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
   dependencies:
     ansi-styles "^4.0.0"
@@ -10855,87 +11400,72 @@ wrap-ansi@^7.0.0:
 
 wrappy@1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
   integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
-write-file-atomic@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
-  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
-  dependencies:
-    imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
-
 write-file-atomic@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-4.0.1.tgz#9faa33a964c1c85ff6f849b80b42a88c2c537c8f"
+  resolved "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz"
   integrity sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==
   dependencies:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.7"
 
-ws@^7.4.6:
-  version "7.5.9"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591"
-  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
+ws@^8.11.0:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
+  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
 
 ws@^8.4.2:
   version "8.8.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.8.1.tgz#5dbad0feb7ade8ecc99b830c1d77c913d4955ff0"
+  resolved "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz"
   integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==
 
 ws@~8.2.3:
   version "8.2.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
+  resolved "https://registry.npmjs.org/ws/-/ws-8.2.3.tgz"
   integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==
 
 xml-beautifier@^0.5.0:
   version "0.5.0"
-  resolved "https://registry.yarnpkg.com/xml-beautifier/-/xml-beautifier-0.5.0.tgz#476fd7118b972c2ec5863babca6812934d34bb56"
+  resolved "https://registry.npmjs.org/xml-beautifier/-/xml-beautifier-0.5.0.tgz"
   integrity sha512-QG/qiHeolHUd1tAtM+5zHxTzDprb8qvhmIYUYV1E9QK/jTFlrAa1Mz7QQqJPeqc3uuFAGzTOhjvbdx2hOP6bHw==
   dependencies:
     repeat-string "1.6.1"
 
-xml-name-validator@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
-  integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
-
 xml-name-validator@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
+  resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz"
   integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
 
 xmlchars@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+  resolved "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
 xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
+  resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
 y18n@^3.2.1:
   version "3.2.2"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.2.tgz#85c901bd6470ce71fc4bb723ad209b70f7f28696"
+  resolved "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz"
   integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
 
 y18n@^5.0.5:
   version "5.0.8"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
 yallist@^2.1.2:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
+  resolved "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"
   integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==
 
 yallist@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
 yaml-jest@^1.2.0:
@@ -10947,7 +11477,7 @@ yaml-jest@^1.2.0:
 
 yaml-loader@^0.8.0:
   version "0.8.0"
-  resolved "https://registry.yarnpkg.com/yaml-loader/-/yaml-loader-0.8.0.tgz#c839325e3fdee082b3768b2a21fe34fde5d96f61"
+  resolved "https://registry.npmjs.org/yaml-loader/-/yaml-loader-0.8.0.tgz"
   integrity sha512-LjeKnTzVBKWiQBeE2L9ssl6WprqaUIxCSNs5tle8PaDydgu3wVFXTbMfsvF2MSErpy9TDVa092n4q6adYwJaWg==
   dependencies:
     javascript-stringify "^2.0.1"
@@ -10956,17 +11486,17 @@ yaml-loader@^0.8.0:
 
 yaml@^1.10.0, yaml@^1.10.2:
   version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
 yaml@^2.0.0:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.1.1.tgz#1e06fb4ca46e60d9da07e4f786ea370ed3c3cfec"
+  resolved "https://registry.npmjs.org/yaml/-/yaml-2.1.1.tgz"
   integrity sha512-o96x3OPo8GjWeSLF+wOAbrPfhFOGY0W00GNaxCDv+9hkcDJEnev1yh8S7pgHF0ik6zc8sQLuL8hjHjJULZp8bw==
 
 yargs-parser@^20.2.2:
   version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
 yargs-parser@^21.0.1, yargs-parser@^21.1.1:
@@ -10976,15 +11506,15 @@ yargs-parser@^21.0.1, yargs-parser@^21.1.1:
 
 yargs-parser@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.1.tgz#7ede329c1d8cdbbe209bd25cdb990e9b1ebbb394"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz"
   integrity sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==
   dependencies:
     camelcase "^3.0.0"
     object.assign "^4.1.0"
 
-yargs@^16.1.1, yargs@^16.2.0:
+yargs@^16.1.1:
   version "16.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"
   integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
   dependencies:
     cliui "^7.0.2"
@@ -10995,9 +11525,22 @@ yargs@^16.1.1, yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
+yargs@^17.3.1:
+  version "17.6.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541"
+  integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==
+  dependencies:
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
+
 yargs@^7.1.0:
   version "7.1.2"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.2.tgz#63a0a5d42143879fdbb30370741374e0641d55db"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz"
   integrity sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==
   dependencies:
     camelcase "^3.0.0"
@@ -11016,5 +11559,5 @@ yargs@^7.1.0:
 
 yocto-queue@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  resolved "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
diff --git a/config/plugins/visualizations/annotate_image/src/script.js b/config/plugins/visualizations/annotate_image/src/script.js
index 2b031ad8295..e8167257e4f 100644
--- a/config/plugins/visualizations/annotate_image/src/script.js
+++ b/config/plugins/visualizations/annotate_image/src/script.js
@@ -437,11 +437,12 @@ window.bundleEntries.load = function (opt) {
         });
     };
 
+    const safe_download_url = `${options.root}${dataset.download_url}`;
     $.ajax({
-        url: dataset.download_url,
+        url: safe_download_url,
         success: function(content) {
             const $chartViewer = $("#" + opt.target);
-            $chartViewer.html("<img id='image-annotate' src='" + dataset.download_url + "' />");
+            $chartViewer.html("<img id='image-annotate' src='" + safe_download_url + "' />");
             $chartViewer.css("overflow", "auto");
             $chartViewer.css("position", "relative");
             const $image = $chartViewer.find("img");
diff --git a/config/plugins/visualizations/cytoscape/src/script.js b/config/plugins/visualizations/cytoscape/src/script.js
index a64ce291ce6..fbcb9510c7d 100644
--- a/config/plugins/visualizations/cytoscape/src/script.js
+++ b/config/plugins/visualizations/cytoscape/src/script.js
@@ -87,7 +87,7 @@ function run_search_algorithm( cytoscape, root_id, type, self ) {
             // Add css class for the selected edge(s)
             algorithm.path[i].addClass( 'searchpath' );
             i++;
-            // Animate the edges and nodes coloring 
+            // Animate the edges and nodes coloring
             // of the path with a delay of 500ms
             setTimeout( selectNextElement, 500 );
         }
@@ -166,8 +166,9 @@ window.bundleEntries.load = function (options) {
     cytoscape = null,
     sif_file_ext = "sif",
     highlighted_color = settings.get( 'color_picker_highlighted' );
+    const safe_download_url = `${options.root}${dataset.download_url}`;
     $.ajax({
-        url     : dataset.download_url,
+        url     : safe_download_url,
         success : function( content ) {
             // Select data for the graph
             if( dataset.file_ext === sif_file_ext ) {
@@ -246,7 +247,7 @@ window.bundleEntries.load = function (options) {
                 // On tapping any node, BFS or DFS start from that node
                 cytoscape.$( 'node' ).on('tap', function( e ) {
                     var ele = e.cyTarget,
-                        search_algorithm = settings.get( 'search_algorithm' ), 
+                        search_algorithm = settings.get( 'search_algorithm' ),
                         traversal_type = settings.get( 'graph_traversal' );
                     // If search algorithm and traversal both are chosen,
                     // search algorithm will take preference
diff --git a/config/plugins/visualizations/drawrna/src/script.js b/config/plugins/visualizations/drawrna/src/script.js
index 52aa7b47791..2b0ac8faf20 100644
--- a/config/plugins/visualizations/drawrna/src/script.js
+++ b/config/plugins/visualizations/drawrna/src/script.js
@@ -3,8 +3,9 @@ window.bundleEntries = window.bundleEntries || {};
 window.bundleEntries.load = function (options) {
     var chart = options.chart;
     var dataset = options.dataset;
+    const safe_download_url = `${options.root}${dataset.download_url}`;
     $.ajax({
-        url: dataset.download_url,
+        url: safe_download_url,
         success: function(response) {
             var input = response.split('\n');
             var app = new DrawRNA({
diff --git a/config/plugins/visualizations/msa/src/script.js b/config/plugins/visualizations/msa/src/script.js
index 163a5b05a6f..a89020f424b 100755
--- a/config/plugins/visualizations/msa/src/script.js
+++ b/config/plugins/visualizations/msa/src/script.js
@@ -14,7 +14,8 @@ Object.assign(window.bundleEntries || {}, {
             menu: "small",
             bootstrapMenu: "true" == settings.get("menu"),
         });
-        msaViz.u.file.importURL(dataset.download_url, () => {
+        const safe_download_url = `${options.root}${dataset.download_url}`;
+        msaViz.u.file.importURL(safe_download_url, () => {
             msaViz.render();
             chart.state("ok", "Chart drawn.");
             options.process.resolve();
diff --git a/config/plugins/visualizations/ngl/src/ngl.js b/config/plugins/visualizations/ngl/src/ngl.js
index 84e00b32fa5..b9d92f73bec 100644
--- a/config/plugins/visualizations/ngl/src/ngl.js
+++ b/config/plugins/visualizations/ngl/src/ngl.js
@@ -19,8 +19,9 @@ window.bundleEntries.load = function (options) {
         opacity: settings.get("opacity"),
     };
     stage_parameters = { ext: dataset.extension, defaultRepresentation: true };
+    const safe_download_url = `${options.root}${dataset.download_url}`;
     try {
-        stage.loadFile(dataset.download_url, stage_parameters).then(function (component) {
+        stage.loadFile(safe_download_url, stage_parameters).then(function (component) {
             component.addRepresentation(settings.get("mode"), representation_parameters);
             options.chart.state("ok", "Chart drawn.");
             options.process.resolve();
diff --git a/config/plugins/visualizations/openlayers/src/script.js b/config/plugins/visualizations/openlayers/src/script.js
index 529f9f6dc93..b4ca4af179f 100644
--- a/config/plugins/visualizations/openlayers/src/script.js
+++ b/config/plugins/visualizations/openlayers/src/script.js
@@ -240,10 +240,11 @@ window.bundleEntries = window.bundleEntries || {};
 window.bundleEntries.load = function (options) {
     const chart = options.chart;
     const dataset = options.dataset;
+    const safe_download_url = `${options.root}${dataset.download_url}`;
     $.ajax({
-        url: dataset.download_url,
+        url: safe_download_url,
         success: () => {
-            MapViewer.loadFile(dataset.download_url, dataset.extension, options, chart);
+            MapViewer.loadFile(safe_download_url, dataset.extension, options, chart);
         },
         error: () => {
             chart.state("failed", "Failed to access dataset.");
diff --git a/config/plugins/visualizations/phylocanvas/src/script.js b/config/plugins/visualizations/phylocanvas/src/script.js
index a4e181a7285..d437bfe6942 100644
--- a/config/plugins/visualizations/phylocanvas/src/script.js
+++ b/config/plugins/visualizations/phylocanvas/src/script.js
@@ -4,8 +4,9 @@ _.extend(window.bundleEntries || {}, {
         var chart = options.chart;
         var dataset = options.dataset;
         var settings = options.chart.settings;
+        const safe_download_url = `${options.root}${dataset.download_url}`;
         $.ajax( {
-            url     : dataset.download_url,
+            url     : safe_download_url,
             success : function( content ) {
                 try {
                     var tree = Phylocanvas.default.createTree( options.target ),
diff --git a/config/plugins/visualizations/pv/src/pv.js b/config/plugins/visualizations/pv/src/pv.js
index 452b4c738e9..14a9bdf7db3 100644
--- a/config/plugins/visualizations/pv/src/pv.js
+++ b/config/plugins/visualizations/pv/src/pv.js
@@ -10,8 +10,9 @@ window.bundleEntries.load = function (options) {
         antialias: true,
         outline: true,
     });
+    const safe_download_url = `${options.root}${dataset.download_url}`;
     var xhr = new XMLHttpRequest();
-    xhr.open("GET", options.dataset.download_url);
+    xhr.open("GET", safe_download_url);
     xhr.onload = function () {
         if (xhr.status === 200) {
             var structure = pv.io.pdb(xhr.response);
diff --git a/config/themes_conf.yml.sample b/config/themes_conf.yml.sample
new file mode 120000
index 00000000000..fd35c50ea86
--- /dev/null
+++ b/config/themes_conf.yml.sample
@@ -0,0 +1 @@
+../lib/galaxy/config/sample/themes_conf.yml.sample
\ No newline at end of file
diff --git a/contrib/galaxy_config_merger.py b/contrib/galaxy_config_merger.py
index 229fb57af6b..b8729ad51f5 100644
--- a/contrib/galaxy_config_merger.py
+++ b/contrib/galaxy_config_merger.py
@@ -30,7 +30,7 @@ def main():
 
     for option in ["sample", "config"]:
         if getattr(options, option) is None:
-            print("Please supply a --%s parameter.\n" % (option))
+            print(f"Please supply a --{option} parameter.\n")
             parser.print_help()
             sys.exit()
 
@@ -45,11 +45,11 @@ def main():
     logging.info("---------- DIFFERENCE ANALYSIS BEGIN ----------")
     for section in config.sections():
         if not config_sample.has_section(section):
-            logging.warning("-MISSING- section [%s] not found in sample file. It will be ignored." % section)
+            logging.warning("-MISSING- section [%s] not found in sample file. It will be ignored.", section)
         else:
             for (name, value) in config.items(section):
                 if not config_sample.has_option(section, name):
-                    if not "#%s" % name in config_sample_content:
+                    if f"#{name}" not in config_sample_content:
                         logging.warning(
                             f"-MISSING- section [{section}] option '{name}' not found in sample file. It will be ignored."
                         )
diff --git a/doc/source/admin/authentication.md b/doc/source/admin/authentication.md
index 426c2a1e787..ba75a8021bc 100644
--- a/doc/source/admin/authentication.md
+++ b/doc/source/admin/authentication.md
@@ -30,6 +30,12 @@ Galaxy is distributed with a plugin-driven authentication framework for which th
 just one (and the default plugin). This framework can be used to allow Galaxy to delegate authentication to
 an LDAP server, an Active Directory server, or to PAM.
 
+Currently, we provide two variants of the LDAP authenticator namely, `ldap` and `ldap3`. Both are identical implementations that use different Python modules for binding and making queries to a LDAP server. The authenticator
+`ldap` is based on the [python-ldap](https://www.python-ldap.org/) module which is a wrapper around the 
+OpenLDAP's client library `libldap`. Currently, `python-ldap` does not provide pre-built Python wheel packages and hence, the OpenLDAP client libraries are needed to install `python-ldap` on the Galaxy server. 
+
+On the otherhand, `ldap3` is a pure-Python implementation of the OpenLDAP client library and has no external dependencies. This package can be installed out-of-the-box, so we recommend to use it when the OpenLDAP client libraries are not available on the Galaxy server.
+
 These same mechanisms can also be configured by proxies serving Galaxy (e.g. nginx or Apache), but configuring them
 within Galaxy allows users to use the Galaxy UI for logging in instead of relying on a proxy.
 
diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst
index 82144530c0d..f36e3162429 100644
--- a/doc/source/admin/galaxy_options.rst
+++ b/doc/source/admin/galaxy_options.rst
@@ -2051,7 +2051,7 @@
 
 :Description:
     The brand image source.
-:Default: ``/static/favicon.png``
+:Default: ``/static/favicon.svg``
 :Type: str
 
 
@@ -3832,6 +3832,73 @@
 :Type: str
 
 
+~~~~~~~~~~~~~~~~~~~~
+``ga4gh_service_id``
+~~~~~~~~~~~~~~~~~~~~
+
+:Description:
+    Service ID for GA4GH services (exposed via the service-info
+    endpoint for the Galaxy DRS API). If unset, one will be generated
+    using the URL the target API requests are made against.
+    For more information on GA4GH service definitions - check out
+    https://github.com/ga4gh-discovery/ga4gh-service-registry and
+    https://editor.swagger.io/?url=https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-registry/develop/service-registry.yaml
+    This value should likely reflect your service's URL. For instance
+    for usegalaxy.org this value should be org.usegalaxy. Particular
+    Galaxy implementations will treat this value as a prefix and
+    append the service type to this ID. For instance for the DRS
+    service "id" (available via the DRS API) for the above
+    configuration value would be org.usegalaxy.drs.
+:Default: ``None``
+:Type: str
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``ga4gh_service_organization_name``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:Description:
+    Service name for host organization (exposed via the service-info
+    endpoint for the Galaxy DRS API). If unset, one will be generated
+    using ga4gh_service_id.
+    For more information on GA4GH service definitions - check out
+    https://github.com/ga4gh-discovery/ga4gh-service-registry and
+    https://editor.swagger.io/?url=https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-registry/develop/service-registry.yaml
+:Default: ``None``
+:Type: str
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``ga4gh_service_organization_url``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:Description:
+    Organization URL for host organization (exposed via the
+    service-info endpoint for the Galaxy DRS API). If unset, one will
+    be generated using the URL the target API requests are made
+    against.
+    For more information on GA4GH service definitions - check out
+    https://github.com/ga4gh-discovery/ga4gh-service-registry and
+    https://editor.swagger.io/?url=https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-registry/develop/service-registry.yaml
+:Default: ``None``
+:Type: str
+
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+``ga4gh_service_environment``
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+:Description:
+    Service environment (exposed via the service-info endpoint for the
+    Galaxy DRS API) for implemented GA4GH services.
+    Suggested values are prod, test, dev, staging.
+    For more information on GA4GH service definitions - check out
+    https://github.com/ga4gh-discovery/ga4gh-service-registry and
+    https://editor.swagger.io/?url=https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-registry/develop/service-registry.yaml
+:Default: ``None``
+:Type: str
+
+
 ~~~~~~~~~~~~~~~~~~~~
 ``enable_tool_tags``
 ~~~~~~~~~~~~~~~~~~~~
@@ -4891,7 +4958,7 @@
 :Description:
     Set remote path of the trained model (HDF5 file) for tool
     recommendation.
-:Default: ``https://github.com/galaxyproject/galaxy-test-data/raw/master/tool_recommendation_model.hdf5``
+:Default: ``https://github.com/galaxyproject/galaxy-test-data/raw/master/tool_recommendation_model_v_0.2.hdf5``
 :Type: str
 
 
@@ -4902,7 +4969,7 @@
 :Description:
     Set the number of predictions/recommendations to be made by the
     model
-:Default: ``10``
+:Default: ``20``
 :Type: int
 
 
@@ -4995,6 +5062,21 @@
 :Type: bool
 
 
+~~~~~~~~~~~~~~~~~~~~~~
+``themes_config_file``
+~~~~~~~~~~~~~~~~~~~~~~
+
+:Description:
+    Optional file containing one or more themes for galaxy. If several
+    themes are defined, users can choose their preferred theme in the
+    client.
+    The value of this option will be resolved with respect to
+    <config_dir>.
+:Default: ``themes_conf.yml``
+:Type: str
+
+
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ``enable_beacon_integration``
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -5005,4 +5087,3 @@
 :Type: bool
 
 
-
diff --git a/doc/source/admin/special_topics/interactivetools.rst b/doc/source/admin/special_topics/interactivetools.rst
index 2e7a3199913..9dd18eac2bf 100644
--- a/doc/source/admin/special_topics/interactivetools.rst
+++ b/doc/source/admin/special_topics/interactivetools.rst
@@ -55,7 +55,8 @@ For users who manage their own DNS, you can set the appropriate A records to red
 `gravity` will automatically start the needed proxy server.
 
 The following configuration is only recommended for local testing, as users will directly connect to the InteractiveTool Proxy.
-In a production setup an upstream proxy should route requests to the proxy via the ``*.interactivetool.yourdomain`` subdomain.
+In a production setup an upstream proxy should route requests to the proxy via the ``*.interactivetool.yourdomain`` subdomain,
+or use path-based proxying for interactive tools that support it (``requires_domain=False``, see below for more details).
 
 Set these values in `galaxy.yml`:
 
@@ -82,23 +83,23 @@ the InteractiveTool proxy:
 
 .. code-block:: nginx
 
-        server {
-            # Listen on port 443
-            listen       *:443 ssl;
-            # Match all requests for the interactive tools subdomain
-            server_name  *.interactivetool.localhost;
+    server {
+        # Listen on port 443
+        listen       *:443 ssl;
+        # Match all requests for the interactive tools subdomain
+        server_name  *.interactivetool.localhost;
 
-            # Route all domain-based interactive tool requests to the InteractiveTool proxy application
-            location / {
-                proxy_redirect off;
-                proxy_http_version 1.1;
-                proxy_set_header Host $host;
-                proxy_set_header X-Real-IP $remote_addr;
-                proxy_set_header Upgrade $http_upgrade;
-                proxy_set_header Connection "upgrade";
-                proxy_pass http://localhost:4002;
-            }
+        # Route all domain-based interactive tool requests to the InteractiveTool proxy application
+        location / {
+            proxy_redirect off;
+            proxy_http_version 1.1;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+            proxy_pass http://localhost:4002;
         }
+    }
 
 
 Note that this nginx example uses https, so you need to have a wildcard certificate for your domain,
@@ -106,29 +107,31 @@ and you need to adjust ``galaxy_infrastructure_url`` as appropriate.
 
 It is also possible to set up nginx to route path-based interactive tool URLs to the InteractiveTool proxy.
 Path-based interactive tool URLs will only be created for tools that have defined ``requires_domain=False`` in the tool
-XML file (which signals that the web server running on the container does not require a domain name to serve pages
-correctly). To support path-based interactive tools through nginx proxy, add the following to the main Galaxy "server"
+XML file (which signals that the web server running on the container makes use of relative links and can serve
+content starting from any path). A tool config variable will be added in the next version to simplify this for
+tools that need to know the path to where it is served.
+
+To support path-based interactive tools through nginx proxy, add the following to the main Galaxy "server"
 section (serving port 443):
 
 .. code-block:: nginx
 
         # Route all path-based interactive tool requests to the InteractiveTool proxy application
-	    location ~* ^/(interactivetool)/access/(.+)/([0-9a-f]+)/([0-9a-f]+)/(.*)$ {
+        location ~* ^/(interactivetool/access/.+)$ {
             proxy_redirect off;
             proxy_http_version 1.1;
-            proxy_set_header Host $3-$4.$1.$host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header Upgrade $http_upgrade;
-	        proxy_set_header Connection "upgrade";
-            proxy_pass http://localhost:4002/$5$is_args$args;
-	}
+            proxy_set_header Connection "upgrade";
+            proxy_pass http://localhost:4002;
+        }
 
-This example config works for default values of `interactivetools_base_path` and `interactivetools_prefix` as defined in
-`galaxy.yml`. For other values, you will need to adjust the regex and rename patterns accordingly. This solution also
-requires `interactivetools_shorten_url` to be set to `false` (not default).
+This example config works for default values of ``interactivetools_base_path`` and ``interactivetools_prefix`` as defined in
+``galaxy.yml``. For other values, you will need to adjust the location patterns accordingly. This solution also
+requires ``interactivetools_shorten_url`` to be set to ``false`` (default).
 
-In both nginx config examples, you will most likely also want to replace localhost with your server domain (or possibly
-``127.0.0.1``).
+In both nginx config examples, you might want to replace localhost with your server domain (or possibly
+``127.0.0.1``), depending on your server setup.
 
 You will also need to enable a docker destination in the job_conf.xml file.
 An example ``job_conf.xml`` file as seen in ``config/job_conf.xml.interactivetools``:
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 8e364417cb7..60cd6dfedab 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -101,7 +101,10 @@ copyright = str(datetime.datetime.now().year) + ", Galaxy Committers"
 # built documents.
 #
 # The short X.Y version.
-from galaxy.version import VERSION, VERSION_MAJOR
+from galaxy.version import (
+    VERSION,
+    VERSION_MAJOR,
+)
 
 version = VERSION_MAJOR
 # The full version, including alpha/beta/rc tags.
@@ -240,11 +243,11 @@ htmlhelp_basename = "Galaxydoc"
 
 latex_elements = {
     # The paper size ('letterpaper' or 'a4paper').
-    #'papersize': 'letterpaper',
+    # 'papersize': 'letterpaper',
     # The font size ('10pt', '11pt' or '12pt').
-    #'pointsize': '10pt',
+    # 'pointsize': '10pt',
     # Additional stuff for the LaTeX preamble.
-    #'preamble': '',
+    # 'preamble': '',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
diff --git a/lib/galaxy/app.py b/lib/galaxy/app.py
index 7043d7a3fea..a4b50420185 100644
--- a/lib/galaxy/app.py
+++ b/lib/galaxy/app.py
@@ -45,6 +45,10 @@ from galaxy.managers.libraries import LibraryManager
 from galaxy.managers.library_datasets import LibraryDatasetsManager
 from galaxy.managers.roles import RoleManager
 from galaxy.managers.session import GalaxySessionManager
+from galaxy.managers.tasks import (
+    AsyncTasksManager,
+    CeleryAsyncTasksManager,
+)
 from galaxy.managers.tools import DynamicToolManager
 from galaxy.managers.users import UserManager
 from galaxy.managers.workflows import (
@@ -538,6 +542,10 @@ class GalaxyManagerApplication(MinimalManagerApp, MinimalGalaxyApplication):
         self.role_manager = self._register_singleton(RoleManager)
         self.job_manager = self._register_singleton(JobManager)
 
+        self.task_manager = self._register_abstract_singleton(
+            AsyncTasksManager, CeleryAsyncTasksManager  # type: ignore[type-abstract]
+        )  # Ignored because of https://github.com/python/mypy/issues/4717
+
         # ConfiguredFileSources
         self.file_sources = self._register_singleton(
             ConfiguredFileSources, ConfiguredFileSources.from_app_config(self.config)
diff --git a/lib/galaxy/auth/providers/__init__.py b/lib/galaxy/auth/providers/__init__.py
index a2be90f4bb5..7e885fb0775 100644
--- a/lib/galaxy/auth/providers/__init__.py
+++ b/lib/galaxy/auth/providers/__init__.py
@@ -9,7 +9,8 @@ import abc
 class AuthProvider(metaclass=abc.ABCMeta):
     """A base class for all Auth Providers."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def plugin_type(self):
         """Short string providing labelling this plugin"""
 
diff --git a/lib/galaxy/auth/providers/alwaysreject.py b/lib/galaxy/auth/providers/alwaysreject.py
index f64b243d9dd..1c21adc834f 100644
--- a/lib/galaxy/auth/providers/alwaysreject.py
+++ b/lib/galaxy/auth/providers/alwaysreject.py
@@ -5,7 +5,7 @@ Created on 16/07/2014
 """
 import logging
 
-from ..providers import AuthProvider
+from . import AuthProvider
 
 log = logging.getLogger(__name__)
 
diff --git a/lib/galaxy/auth/providers/ldap_ad.py b/lib/galaxy/auth/providers/ldap_ad.py
index cedd6a8f9f2..6d552711d7f 100644
--- a/lib/galaxy/auth/providers/ldap_ad.py
+++ b/lib/galaxy/auth/providers/ldap_ad.py
@@ -2,9 +2,17 @@
 Created on 15/07/2014
 
 @author: Andrew Robinson
+
+Modification on 24/10/2022
+
+Addition of LDAP3 auth provider using the ldap3 module. The original LDAP auth provider uses the python-ldap library which
+has external dependencies like openldap client libs. ldap3 is a pure Python LDAP v3 client library.
+
+@author: Mahendra Paipuri, CNRS
 """
 
 import logging
+from urllib.parse import urlparse
 
 from galaxy.exceptions import ConfigurationError
 from galaxy.security.validate_user_input import transform_publicname
@@ -12,7 +20,7 @@ from galaxy.util import (
     string_as_bool,
     unicodify,
 )
-from ..providers import AuthProvider
+from . import AuthProvider
 
 try:
     import ldap
@@ -20,6 +28,12 @@ except ImportError as exc:
     ldap = None
     ldap_import_exc = exc
 
+try:
+    import ldap3
+except ImportError as exc:
+    ldap3 = None
+    ldap3_import_exc = exc
+
 log = logging.getLogger(__name__)
 
 
@@ -282,6 +296,155 @@ class LDAP(AuthProvider):
         return self.authenticate(user.email, user.username, password, options, request)[0]
 
 
+class LDAP3(LDAP):
+    """LDAP auth provider using ldap3 module"""
+
+    plugin_type = "ldap3"
+
+    def __init__(self):
+        super().__init__()
+        # Initialise server and autobind objects
+        self.server = None
+        self.auto_bind = None
+        # LDAP over TLS bool
+        self.ldap_tls = None
+
+    def get_server(self, options, params):
+        # Get server URL
+        server_url = _get_subs(options, "server", params)
+        # Check if server URL has scheme
+        # If no scheme is provided, assume it to be ldap
+        if "ldap" not in server_url:
+            server_url = f"ldaps://{server_url}"
+        # Check if TLS is available
+        if server_url.startswith("ldaps://"):
+            self.ldap_tls = True
+        else:
+            self.ldap_tls = False
+        # Get server address and port
+        url_obj = urlparse(server_url)
+        server_address = url_obj.hostname
+        try:
+            server_port = int(url_obj.port)
+        except TypeError:
+            # If port is not specified use standard port numbers based on TLS
+            if self.ldap_tls:
+                server_port = 636
+            else:
+                server_port = 389
+        # Create server object
+        self.server = ldap3.Server(server_address, port=server_port, use_ssl=self.ldap_tls, get_info=ldap3.ALL)
+        # Set auto_bind
+        self.auto_bind = ldap3.AUTO_BIND_NO_TLS if self.ldap_tls else ldap3.AUTO_BIND_TLS_BEFORE_BIND
+
+    def ldap_search(self, email, username, options):
+        config_ok, failure_mode = self.check_config(username, email, options)
+        if ldap3 is None:
+            raise RuntimeError("Failed to load LDAP3 module: %s", str(ldap3_import_exc))
+
+        if not config_ok:
+            return failure_mode, None
+
+        params = {"email": email, "username": username}
+
+        if "search-fields" in options:
+            try:
+                # Initialise server object
+                self.get_server(options, params)
+                if "search-user" in options:
+                    conn = ldap3.Connection(
+                        self.server,
+                        user=_get_subs(options, "search-user", params),
+                        password=_get_subs(options, "search-password", params),
+                        auto_bind=self.auto_bind,
+                    )
+                else:
+                    conn = ldap3.Connection(self.server, auto_bind=self.auto_bind)
+                # Use StartTLS if LDAP connection is not over TLS
+                if not self.ldap_tls:
+                    conn.start_tls()
+                # setup search
+                attributes = {_.strip().format(**params) for _ in options["search-fields"].split(",")}
+                if "search-memberof-filter" in options:
+                    attributes.add("memberOf")
+                conn.search(
+                    search_base=_get_subs(options, "search-base", params),
+                    search_scope=ldap3.SUBTREE,
+                    search_filter=_get_subs(options, "search-filter", params),
+                    attributes=attributes,
+                    time_limit=60,
+                    size_limit=1,
+                )
+                response = conn.response
+                # Unbind connection
+                conn.unbind()
+
+                # parse results
+                if len(response) == 0 or "attributes" not in response[0].keys():
+                    log.warning("LDAP3 authenticate: search returned no results")
+                    return (failure_mode, None)
+                dn = response[0]["dn"]
+                attrs = response[0]["attributes"]
+                log.debug("LDAP3 authenticate: dn is %s", dn)
+                log.debug("LDAP3 authenticate: search attributes are %s", attrs)
+                for attr in attributes:
+                    if self.role_search_attribute and attr == self.role_search_attribute[1:-1]:  # strip curly brackets
+                        # keep role names as list
+                        params[self.role_search_option] = [unicodify(_) for _ in attrs[attr]]
+                    elif attr == "memberOf":
+                        params[attr] = [unicodify(_) for _ in attrs[attr]]
+                    elif attr in attrs:
+                        params[attr] = unicodify(attrs[attr][0])
+                    else:
+                        params[attr] = ""
+
+                if self.auto_create_roles_or_groups and self.role_search_option not in params:
+                    raise ConfigurationError(
+                        "Missing or mismatching LDAP parameters for %s. Make sure the %s is "
+                        "included in the 'search-fields'." % (self.role_search_option, self.role_search_attribute)
+                    )
+                params["dn"] = dn
+            except Exception:
+                log.exception("LDAP3 authenticate: search exception")
+                return (failure_mode, None)
+
+        return failure_mode, params
+
+    def _authenticate(self, params, options):
+        """
+        Do the actual authentication by binding as the user to check their credentials
+        """
+        try:
+            # Initialise server object
+            self.get_server(options, params)
+            conn = ldap3.Connection(
+                self.server,
+                user=_get_subs(options, "bind-user", params),
+                password=_get_subs(options, "bind-password", params),
+                auto_bind=self.auto_bind,
+            )
+            # Use StartTLS if LDAP connection is not over TLS
+            if not self.ldap_tls:
+                conn.start_tls()
+            try:
+                whoami = conn.extend.standard.who_am_i()
+                # Unbind connection
+                conn.unbind()
+            except ldap3.LDAPExtensionError:
+                # The "Who am I?" extended operation is not supported by this LDAP server
+                pass
+            else:
+                if whoami is None:
+                    raise RuntimeError("LDAP3 authenticate: anonymous bind")
+                if not options["redact_username_in_logs"]:
+                    log.debug("LDAP3 authenticate: whoami is %s", whoami)
+        except Exception as e:
+            log.info("LDAP3 authenticate: bind exception: %s", unicodify(e))
+            return False
+        log.debug("LDAP3 authentication successful")
+        return True
+
+
 class ActiveDirectory(LDAP):
     """Effectively just an alias for LDAP auth, but may contain active directory specific
     logic in the future."""
@@ -289,4 +452,22 @@ class ActiveDirectory(LDAP):
     plugin_type = "activedirectory"
 
 
-__all__ = ("LDAP", "ActiveDirectory")
+__all__ = ("LDAP", "LDAP3", "ActiveDirectory")
+
+if __name__ == "__main__":
+    # Instantiate LDAP3 class
+    c = LDAP3()
+    # Define options
+    options = {
+        "server": "ipa.demo1.freeipa.org",
+        "bind-user": "{dn}",
+        "bind-password": "{password}",
+        "search-fields": "uid",
+        "search-filter": "(uid={username})",
+        "search-base": "cn=users,cn=accounts,dc=demo1,dc=freeipa,dc=org",
+        "redact_username_in_logs": False,
+        "auto-register-username": "{uid}",
+        "auto-register-email": "{uid}@example.com",
+    }
+    # Test method
+    print(c.authenticate("admin@example.com", "admin", "Secret123", options, None))
diff --git a/lib/galaxy/auth/providers/localdb.py b/lib/galaxy/auth/providers/localdb.py
index 8acf20a3f66..bd5c765af20 100644
--- a/lib/galaxy/auth/providers/localdb.py
+++ b/lib/galaxy/auth/providers/localdb.py
@@ -5,7 +5,7 @@ Created on 16/07/2014
 """
 import logging
 
-from ..providers import AuthProvider
+from . import AuthProvider
 
 log = logging.getLogger(__name__)
 
diff --git a/lib/galaxy/auth/providers/pam_auth.py b/lib/galaxy/auth/providers/pam_auth.py
index d077a5f467f..65c15034bb7 100644
--- a/lib/galaxy/auth/providers/pam_auth.py
+++ b/lib/galaxy/auth/providers/pam_auth.py
@@ -10,7 +10,7 @@ from galaxy.util import (
     commands,
     string_as_bool,
 )
-from ..providers import AuthProvider
+from . import AuthProvider
 
 log = logging.getLogger(__name__)
 
diff --git a/lib/galaxy/authnz/custos_authnz.py b/lib/galaxy/authnz/custos_authnz.py
index 5ba223cb721..dc7101915ff 100644
--- a/lib/galaxy/authnz/custos_authnz.py
+++ b/lib/galaxy/authnz/custos_authnz.py
@@ -23,7 +23,7 @@ from galaxy.model import (
     User,
 )
 from galaxy.model.orm.util import add_object_to_object_session
-from ..authnz import IdentityProvider
+from . import IdentityProvider
 
 try:
     import pkce
diff --git a/lib/galaxy/authnz/psa_authnz.py b/lib/galaxy/authnz/psa_authnz.py
index de6a6b4d576..b8d1c636797 100644
--- a/lib/galaxy/authnz/psa_authnz.py
+++ b/lib/galaxy/authnz/psa_authnz.py
@@ -15,15 +15,15 @@ from social_core.utils import (
 from sqlalchemy.exc import IntegrityError
 
 from galaxy.exceptions import MalformedContents
-from galaxy.util import DEFAULT_SOCKET_TIMEOUT
-from ..authnz import IdentityProvider
-from ..model import (
+from galaxy.model import (
     PSAAssociation,
     PSACode,
     PSANonce,
     PSAPartial,
     UserAuthnzToken,
 )
+from galaxy.util import DEFAULT_SOCKET_TIMEOUT
+from . import IdentityProvider
 
 # key: a component name which PSA requests.
 # value: is the name of a class associated with that key.
diff --git a/lib/galaxy/celery/tasks.py b/lib/galaxy/celery/tasks.py
index a0a9bf63a6a..8c7fdc1d47a 100644
--- a/lib/galaxy/celery/tasks.py
+++ b/lib/galaxy/celery/tasks.py
@@ -31,6 +31,7 @@ from galaxy.managers.hdas import HDAManager
 from galaxy.managers.lddas import LDDAManager
 from galaxy.managers.markdown_util import generate_branded_pdf
 from galaxy.managers.model_stores import ModelStoreManager
+from galaxy.managers.tool_data import ToolDataImportManager
 from galaxy.metadata.set_metadata import set_metadata_portable
 from galaxy.model.scoped_session import galaxy_scoped_session
 from galaxy.schema.tasks import (
@@ -220,12 +221,11 @@ def is_aborted(session: galaxy_scoped_session, job_id: int):
     ).scalar()
 
 
-def abort_when_job_stops(function: Callable, session: galaxy_scoped_session, job_id: int, *args, **kwargs) -> Any:
+def abort_when_job_stops(function: Callable, session: galaxy_scoped_session, job_id: int, **kwargs) -> Any:
     if not is_aborted(session, job_id):
         future = celery_app.fork_pool.submit(
             function,
             timeout=None,
-            *args,
             **kwargs,
         )
         while True:
@@ -358,6 +358,29 @@ def compute_dataset_hash(
     dataset_manager.compute_hash(request)
 
 
+@galaxy_task(action="import a data bundle")
+def import_data_bundle(
+    hda_manager: HDAManager,
+    ldda_manager: LDDAManager,
+    tool_data_import_manager: ToolDataImportManager,
+    config: GalaxyAppConfiguration,
+    src: str,
+    uri: Optional[str] = None,
+    id: Optional[int] = None,
+):
+    if src == "uri":
+        assert uri
+        tool_data_import_manager.import_data_bundle_by_uri(config, uri)
+    else:
+        assert id
+        dataset: model.DatasetInstance
+        if src == "hda":
+            dataset = hda_manager.by_id(id)
+        else:
+            dataset = ldda_manager.by_id(id)
+        tool_data_import_manager.import_data_bundle_by_dataset(config, dataset)
+
+
 @galaxy_task(action="pruning history audit table")
 def prune_history_audit_table(sa_session: galaxy_scoped_session):
     """Prune ever growing history_audit table."""
diff --git a/lib/galaxy/config/__init__.py b/lib/galaxy/config/__init__.py
index 8a9cedda435..0482f2bed21 100644
--- a/lib/galaxy/config/__init__.py
+++ b/lib/galaxy/config/__init__.py
@@ -48,6 +48,7 @@ from galaxy.util.properties import (
     read_properties_from_file,
     running_from_source,
 )
+from galaxy.util.themes import flatten_theme
 from ..version import (
     VERSION_MAJOR,
     VERSION_MINOR,
@@ -663,6 +664,7 @@ class GalaxyAppConfiguration(BaseAppConfiguration, CommonConfigurationMixin):
         "file_path",
         "tool_data_table_config_path",
         "tool_config_file",
+        "themes_config_file",
     }
 
     add_sample_file_to_defaults = {
@@ -718,6 +720,8 @@ class GalaxyAppConfiguration(BaseAppConfiguration, CommonConfigurationMixin):
     pretty_datetime_format: str
     visualization_plugins_directory: str
     galaxy_infrastructure_url: str
+    themes: Dict[str, Dict[str, str]]
+    themes_by_host: Dict[str, Dict[str, Dict[str, str]]]
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -766,12 +770,15 @@ class GalaxyAppConfiguration(BaseAppConfiguration, CommonConfigurationMixin):
         val = getattr(self, config_option)
         if config_option in self.schema.per_host_options:
             per_host_option = f"{config_option}_by_host"
+            per_host: Dict[str, Any] = {}
             if per_host_option in self.config_dict:
                 per_host = self.config_dict[per_host_option] or {}
-                for host_key, host_val in per_host.items():
-                    if host_key in host:
-                        val = host_val
-                        break
+            else:
+                per_host = getattr(self, per_host_option, {})
+            for host_key, host_val in per_host.items():
+                if host_key in host:
+                    val = host_val
+                    break
 
         return val
 
@@ -1166,6 +1173,27 @@ class GalaxyAppConfiguration(BaseAppConfiguration, CommonConfigurationMixin):
             }
             LOGGING_CONFIG_DEFAULT["root"]["handlers"].append("files")
 
+        # Load and flatten themes into css variables
+        def _load_theme(path: str, theme_dict: dict):
+            if self._path_exists(path):
+                with open(path) as f:
+                    themes = yaml.safe_load(f)
+                    for key, val in themes.items():
+                        theme_dict[key] = flatten_theme(val)
+
+        self.themes = {}
+
+        if "themes_config_file_by_host" in self.config_dict:
+            self.themes_by_host = {}
+            resolve_to_dir = self.schema.paths_to_resolve["themes_config_file"]
+            resolve_dir_path = getattr(self, resolve_to_dir)
+            for host, file_name in self.config_dict["themes_config_file_by_host"].items():
+                self.themes_by_host[host] = {}
+                file_path = self._in_dir(resolve_dir_path, file_name)
+                _load_theme(file_path, self.themes_by_host[host])
+        else:
+            _load_theme(self.themes_config_file, self.themes)
+
     def _configure_dataset_storage(self):
         # The default for `file_path` has changed in 20.05; we may need to fall back to the old default
         self._set_alt_paths("file_path", self._in_data_dir("files"))  # this is called BEFORE guessing id/uuid
diff --git a/lib/galaxy/config/config_manage.py b/lib/galaxy/config/config_manage.py
index 2147607e738..ef21f95b333 100644
--- a/lib/galaxy/config/config_manage.py
+++ b/lib/galaxy/config/config_manage.py
@@ -358,7 +358,7 @@ def _validate(args: Namespace, app_desc: App) -> None:
         ordered_dump(raw_config, config_p)
 
     def _clean(p: Tuple[str, ...], k: str, v: Any) -> bool:
-        return k not in ["reloadable", "path_resolves_to", "per_host", "deprecated_alias"]
+        return k not in ["reloadable", "path_resolves_to", "per_host", "deprecated_alias", "resolves_to"]
 
     clean_schema = remap(app_desc.schema.raw_schema, _clean)
     with tempfile.NamedTemporaryFile("w", suffix=".yml") as fp:
diff --git a/lib/galaxy/config/sample/auth_conf.xml.sample b/lib/galaxy/config/sample/auth_conf.xml.sample
index 41077a43c99..38c51e3ceee 100644
--- a/lib/galaxy/config/sample/auth_conf.xml.sample
+++ b/lib/galaxy/config/sample/auth_conf.xml.sample
@@ -57,7 +57,9 @@
                  Options and values should match those from the python-ldap
                  documentation.
                  The following example allows connecting to ldaps:// (SSL/TLS)
-                 when self-signed certificates are used -->
+                 when self-signed certificates are used 
+                 These options are valid only if ldap provider is used. 
+                 For ldap3 none of these options are used-->
 <!--        <ldap-options>OPT_X_TLS_REQUIRE_CERT=OPT_X_TLS_ALLOW</ldap-options>
 -->
             <!-- Whether unregistered users should use their LDAP username
diff --git a/lib/galaxy/config/sample/datatypes_conf.xml.sample b/lib/galaxy/config/sample/datatypes_conf.xml.sample
index a2b068b1a4b..2efd24f4af4 100644
--- a/lib/galaxy/config/sample/datatypes_conf.xml.sample
+++ b/lib/galaxy/config/sample/datatypes_conf.xml.sample
@@ -296,6 +296,7 @@
     <datatype extension="agilentmasshunter.d.tar" type="galaxy.datatypes.binary:MassHunterTar" display_in_upload="true"/>
     <datatype extension="watersmasslynx.raw.tar" type="galaxy.datatypes.binary:MassLynxTar" display_in_upload="true"/>
     <datatype extension="wiff.tar" type="galaxy.datatypes.binary:WiffTar" display_in_upload="true"/>
+    <datatype extension="wiff2.tar" type="galaxy.datatypes.binary:Wiff2Tar" display_in_upload="true"/>
     <datatype extension="mascotxml" type="galaxy.datatypes.proteomics:MascotXML" mimetype="application/xml" display_in_upload="true"/>
     <datatype extension="mztab" type="galaxy.datatypes.proteomics:MzTab" display_in_upload="true"/>
     <datatype extension="mztab2" type="galaxy.datatypes.proteomics:MzTab2" display_in_upload="true"/>
@@ -305,6 +306,7 @@
     <datatype extension="bref3" type="galaxy.datatypes.binary:Bref3" display_in_upload="true" description="Bref3 format is a binary format for storing phased, non-missing genotypes for a list of samples. More information in https://faculty.washington.edu/browning/beagle/bref3.14May18.pdf" />
     <datatype extension="mgf" type="galaxy.datatypes.proteomics:Mgf" display_in_upload="true"/>
     <datatype extension="wiff" type="galaxy.datatypes.proteomics:Wiff" display_in_upload="true"/>
+    <datatype extension="wiff2" type="galaxy.datatypes.proteomics:Wiff2" display_in_upload="true"/>
     <datatype extension="mzxml" type="galaxy.datatypes.proteomics:MzXML" mimetype="application/xml" display_in_upload="true"/>
     <datatype extension="mzdata" type="galaxy.datatypes.proteomics:MzData" mimetype="application/xml" display_in_upload="true"/>
     <datatype extension="ms2" type="galaxy.datatypes.proteomics:Ms2" display_in_upload="true"/>
@@ -398,6 +400,7 @@
       <converter file="interval_to_bgzip_converter.xml" target_datatype="bgzip"/>
       <converter file="interval_to_tabix_converter.xml" target_datatype="tabix" depends_on="bgzip"/>
     </datatype>
+    <datatype extension="psl" type="galaxy.datatypes.tabular:Psl" display_in_upload="true"/>
     <datatype extension="obo" type="galaxy.datatypes.text:Obo" mimetype="text/html" display_in_upload="true"/>
     <datatype extension="owl" type="galaxy.datatypes.xml:Owl" mimetype="text/html" display_in_upload="true"/>
     <datatype extension="png" type="galaxy.datatypes.images:Png" mimetype="image/png" display_in_upload="true"/>
@@ -1125,6 +1128,7 @@
     <sniffer type="galaxy.datatypes.interval:Gff"/>
     <sniffer type="galaxy.datatypes.interval:Gff3"/>
     <sniffer type="galaxy.datatypes.tabular:Pileup"/>
+    <sniffer type="galaxy.datatypes.tabular:Psl"/>
     <sniffer type="galaxy.datatypes.text:Paf"/>
     <sniffer type="galaxy.datatypes.interval:Interval"/>
     <sniffer type="galaxy.datatypes.tabular:Sam"/>
diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample
index 04a63b99c67..21b7e587206 100644
--- a/lib/galaxy/config/sample/galaxy.yml.sample
+++ b/lib/galaxy/config/sample/galaxy.yml.sample
@@ -1292,7 +1292,7 @@ galaxy:
   #logo_url: /
 
   # The brand image source.
-  #logo_src: /static/favicon.png
+  #logo_src: /static/favicon.svg
 
   # The custom brand image source.
   #logo_src_secondary: null
@@ -2088,6 +2088,44 @@ galaxy:
   # production server.
   #bootstrap_admin_api_key: null
 
+  # Service ID for GA4GH services (exposed via the service-info endpoint
+  # for the Galaxy DRS API). If unset, one will be generated using the
+  # URL the target API requests are made against.
+  # For more information on GA4GH service definitions - check out
+  # https://github.com/ga4gh-discovery/ga4gh-service-registry and
+  # https://editor.swagger.io/?url=https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-registry/develop/service-registry.yaml
+  # This value should likely reflect your service's URL. For instance
+  # for usegalaxy.org this value should be org.usegalaxy. Particular
+  # Galaxy implementations will treat this value as a prefix and append
+  # the service type to this ID. For instance for the DRS service "id"
+  # (available via the DRS API) for the above configuration value would
+  # be org.usegalaxy.drs.
+  #ga4gh_service_id: null
+
+  # Service name for host organization (exposed via the service-info
+  # endpoint for the Galaxy DRS API). If unset, one will be generated
+  # using ga4gh_service_id.
+  # For more information on GA4GH service definitions - check out
+  # https://github.com/ga4gh-discovery/ga4gh-service-registry and
+  # https://editor.swagger.io/?url=https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-registry/develop/service-registry.yaml
+  #ga4gh_service_organization_name: null
+
+  # Organization URL for host organization (exposed via the service-info
+  # endpoint for the Galaxy DRS API). If unset, one will be generated
+  # using the URL the target API requests are made against.
+  # For more information on GA4GH service definitions - check out
+  # https://github.com/ga4gh-discovery/ga4gh-service-registry and
+  # https://editor.swagger.io/?url=https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-registry/develop/service-registry.yaml
+  #ga4gh_service_organization_url: null
+
+  # Service environment (exposed via the service-info endpoint for the
+  # Galaxy DRS API) for implemented GA4GH services.
+  # Suggested values are prod, test, dev, staging.
+  # For more information on GA4GH service definitions - check out
+  # https://github.com/ga4gh-discovery/ga4gh-service-registry and
+  # https://editor.swagger.io/?url=https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-registry/develop/service-registry.yaml
+  #ga4gh_service_environment: null
+
   # Enable tool tags (associating tools with tags).  This has its own
   # option since its implementation has a few performance implications
   # on startup for large servers.
@@ -2613,11 +2651,11 @@ galaxy:
 
   # Set remote path of the trained model (HDF5 file) for tool
   # recommendation.
-  #tool_recommendation_model_path: https://github.com/galaxyproject/galaxy-test-data/raw/master/tool_recommendation_model.hdf5
+  #tool_recommendation_model_path: https://github.com/galaxyproject/galaxy-test-data/raw/master/tool_recommendation_model_v_0.2.hdf5
 
   # Set the number of predictions/recommendations to be made by the
   # model
-  #topk_recommendations: 10
+  #topk_recommendations: 20
 
   # Set path to the additional tool preferences from Galaxy admins. It
   # has two blocks. One for listing deprecated tools which will be
@@ -2659,6 +2697,13 @@ galaxy:
   # Display built-in converters in the tool panel.
   #display_builtin_converters: true
 
+  # Optional file containing one or more themes for galaxy. If several
+  # themes are defined, users can choose their preferred theme in the
+  # client.
+  # The value of this option will be resolved with respect to
+  # <config_dir>.
+  #themes_config_file: themes_conf.yml
+
   # Enables user preferences and api endpoint for the beacon
   # integration.
   #enable_beacon_integration: false
diff --git a/lib/galaxy/config/sample/themes_conf.yml.sample b/lib/galaxy/config/sample/themes_conf.yml.sample
new file mode 100644
index 00000000000..11b3ddcd38d
--- /dev/null
+++ b/lib/galaxy/config/sample/themes_conf.yml.sample
@@ -0,0 +1,76 @@
+blue:
+  masthead:
+    color: "#2c3143"
+    text:
+      color: "#f8f9fa"
+      hover: gold
+      active: white
+    link:
+      color: transparent
+      hover: transparent
+      active: "#181a24"
+    logo:
+      img: "/static/favicon.svg"
+      img-secondary: null
+
+lightblue:
+  masthead:
+    color: "#384E77"
+    text:
+      color: white
+      hover: "#E6F9AF"
+      active: white
+    link:
+      color: transparent
+      hover: transparent
+      active: "#18314F"
+    logo:
+      img: "/static/favicon.svg"
+
+pride:
+  masthead:
+      color: >
+        linear-gradient(120deg,
+          #3c476d 0px 130px,
+          #fdda0f 131px 139px,
+          #fff 140px 148px,
+          #f4b0c9 149px 157px,
+          #7ccee6 158px 166px,
+          #93540c 167px 175px,
+          #000 176px 184px,
+          transparent 185px),
+        linear-gradient(270deg,
+          #3c476d 0px 110px,
+          #3c476d00 110px),
+        linear-gradient(180deg,
+          #FE0000 16.66%,
+          #FD8C00 16.66% 33.32%,
+          #FFE500 33.32% 49.98%,
+          #119F0B 49.98% 66.64%,
+          #0644B3 66.64% 83.3%,
+          #C22EDC 83.3%)
+      text:
+        color: white
+        hover: gold
+        active: white
+      link:
+        color: "#3c476d"
+        hover: "#323a53"
+        active: "#6170a6"
+      logo:
+        img: "/static/favicon.svg"
+        img-secondary: null
+
+smoky:
+  masthead:
+    color: "#0C0F0A"
+    text:
+      color: white
+      hover: "#FBFF12"
+      active: white
+    link:
+      color: transparent
+      hover: transparent
+      active: "#FF206E"
+    logo:
+      img: "/static/favicon.svg"
diff --git a/lib/galaxy/config/schema.py b/lib/galaxy/config/schema.py
index b250a60b05f..cc090f3954c 100644
--- a/lib/galaxy/config/schema.py
+++ b/lib/galaxy/config/schema.py
@@ -60,7 +60,11 @@ class AppSchema(Schema):
             if data.get("reloadable"):
                 self._reloadable_options.add(key)
             if data.get("per_host"):
-                self._per_host_options.add(key)
+                resolves_to = data.get("resolves_to")
+                if resolves_to:
+                    self._per_host_options.add(resolves_to)
+                else:
+                    self._per_host_options.add(key)
             if data.get("path_resolves_to"):
                 self._paths_to_resolve[key] = data.get("path_resolves_to")
 
diff --git a/lib/galaxy/config/schemas/config_schema.yml b/lib/galaxy/config/schemas/config_schema.yml
index 2da75d3c7e0..11a58011dec 100644
--- a/lib/galaxy/config/schemas/config_schema.yml
+++ b/lib/galaxy/config/schemas/config_schema.yml
@@ -1479,7 +1479,7 @@ mapping:
 
       logo_src:
         type: str
-        default: /static/favicon.png
+        default: /static/favicon.svg
         required: false
         per_host: true
         desc: |
@@ -2785,6 +2785,58 @@ mapping:
           a real admin user account via API.
           You should probably not set this on a production server.
 
+      ga4gh_service_id:
+        type: str
+        required: false
+        desc: |
+          Service ID for GA4GH services (exposed via the service-info endpoint for the Galaxy DRS API).
+          If unset, one will be generated using the URL the target API requests are made against.
+
+          For more information on GA4GH service definitions - check out
+          https://github.com/ga4gh-discovery/ga4gh-service-registry
+          and https://editor.swagger.io/?url=https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-registry/develop/service-registry.yaml
+
+          This value should likely reflect your service's URL. For instance for usegalaxy.org
+          this value should be org.usegalaxy. Particular Galaxy implementations will treat this
+          value as a prefix and append the service type to this ID. For instance for the DRS
+          service "id" (available via the DRS API) for the above configuration value would be
+          org.usegalaxy.drs.
+
+      ga4gh_service_organization_name:
+        type: str
+        required: false
+        desc: |
+          Service name for host organization (exposed via the service-info endpoint for the Galaxy DRS API).
+          If unset, one will be generated using ga4gh_service_id.
+
+          For more information on GA4GH service definitions - check out
+          https://github.com/ga4gh-discovery/ga4gh-service-registry
+          and https://editor.swagger.io/?url=https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-registry/develop/service-registry.yaml
+
+      ga4gh_service_organization_url:
+        type: str
+        required: False
+        desc: |
+          Organization URL for host organization (exposed via the service-info endpoint for the Galaxy DRS API).
+          If unset, one will be generated using the URL the target API requests are made against.
+
+          For more information on GA4GH service definitions - check out
+          https://github.com/ga4gh-discovery/ga4gh-service-registry
+          and https://editor.swagger.io/?url=https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-registry/develop/service-registry.yaml
+
+      ga4gh_service_environment:
+        type: str
+        required: False
+        desc: |
+          Service environment (exposed via the service-info endpoint for the Galaxy DRS API) for
+          implemented GA4GH services.
+
+          Suggested values are prod, test, dev, staging.
+
+          For more information on GA4GH service definitions - check out
+          https://github.com/ga4gh-discovery/ga4gh-service-registry
+          and https://editor.swagger.io/?url=https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-registry/develop/service-registry.yaml
+
       enable_tool_tags:
         type: bool
         default: false
@@ -3562,14 +3614,14 @@ mapping:
 
       tool_recommendation_model_path:
         type: str
-        default: 'https://github.com/galaxyproject/galaxy-test-data/raw/master/tool_recommendation_model.hdf5'
+        default: 'https://github.com/galaxyproject/galaxy-test-data/raw/master/tool_recommendation_model_v_0.2.hdf5'
         required: false
         desc: |
           Set remote path of the trained model (HDF5 file) for tool recommendation.
 
       topk_recommendations:
         type: int
-        default: 10
+        default: 20
         required: false
         desc: |
           Set the number of predictions/recommendations to be made by the model
@@ -3632,6 +3684,17 @@ mapping:
         required: false
         desc: Display built-in converters in the tool panel.
 
+      themes_config_file:
+        type: str
+        default: themes_conf.yml
+        path_resolves_to: config_dir
+        resolves_to: themes
+        per_host: true
+        required: false
+        desc: |
+          Optional file containing one or more themes for galaxy. If several themes
+          are defined, users can choose their preferred theme in the client.
+
       enable_beacon_integration:
         type: bool
         default: false
diff --git a/lib/galaxy/datatypes/annotation.py b/lib/galaxy/datatypes/annotation.py
index b8eb217bc66..de5d113ff78 100644
--- a/lib/galaxy/datatypes/annotation.py
+++ b/lib/galaxy/datatypes/annotation.py
@@ -1,5 +1,6 @@
 import logging
 import tarfile
+from typing import TYPE_CHECKING
 
 from galaxy.datatypes.binary import CompressedArchive
 from galaxy.datatypes.data import (
@@ -12,6 +13,9 @@ from galaxy.datatypes.sniff import (
 )
 from galaxy.util import nice_size
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 
@@ -20,7 +24,7 @@ class SnapHmm(Text):
     file_ext = "snaphmm"
     edam_data = "data_1364"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             dataset.blurb = "SNAP HMM model"
@@ -28,13 +32,13 @@ class SnapHmm(Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disc"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
             return f"SNAP HMM model ({nice_size(dataset.get_size())})"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         SNAP model files start with zoeHMM
         """
@@ -50,7 +54,7 @@ class Augustus(CompressedArchive):
     edam_data = "data_0950"
     compressed = True
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Augustus model"
             dataset.blurb = nice_size(dataset.get_size())
@@ -58,13 +62,13 @@ class Augustus(CompressedArchive):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
             return f"Augustus model ({nice_size(dataset.get_size())})"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """
         Augustus archives always contain the same files
         """
diff --git a/lib/galaxy/datatypes/anvio.py b/lib/galaxy/datatypes/anvio.py
index 81f024b6965..5a3f40e1e2d 100644
--- a/lib/galaxy/datatypes/anvio.py
+++ b/lib/galaxy/datatypes/anvio.py
@@ -5,11 +5,18 @@ https://github.com/merenlab/anvio
 import glob
 import logging
 import os
-from typing import Optional
+from typing import (
+    Optional,
+    TYPE_CHECKING,
+)
 
+from galaxy.datatypes.data import GeneratePrimaryFileDataset
 from galaxy.datatypes.metadata import MetadataElement
 from galaxy.datatypes.text import Html
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 
@@ -22,7 +29,7 @@ class AnvioComposite(Html):
     file_ext = "anvio_composite"
     composite_type = "auto_primary_file"
 
-    def generate_primary_file(self, dataset):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         """
         This is called only at upload to write the html file
         cannot rename the datasets here - they come with the default unfortunately
@@ -57,11 +64,11 @@ class AnvioComposite(Html):
         rval.append("</html>")
         return "\n".join(rval)
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Returns the mime type of the datatype"""
         return "text/html"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = "Anvio database (multiple files)"
@@ -70,7 +77,7 @@ class AnvioComposite(Html):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Create HTML content, used for displaying peek."""
         try:
             return dataset.peek
@@ -90,11 +97,11 @@ class AnvioDB(AnvioComposite):
         if self._anvio_basename is not None:
             self.add_composite_file(self._anvio_basename, is_binary=True, optional=False)
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the anvio_basename based upon actual extra_files_path contents.
         """
-        super().set_meta(dataset, **kwd)
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
         if dataset.metadata.anvio_basename is not None and os.path.exists(
             os.path.join(dataset.extra_files_path, dataset.metadata.anvio_basename)
         ):
diff --git a/lib/galaxy/datatypes/assembly.py b/lib/galaxy/datatypes/assembly.py
index 83ce0befae2..7cfe64e165a 100644
--- a/lib/galaxy/datatypes/assembly.py
+++ b/lib/galaxy/datatypes/assembly.py
@@ -7,11 +7,13 @@ for velvet assembler tool in galaxy
 import logging
 import os
 import re
+from typing import TYPE_CHECKING
 
 from galaxy.datatypes import (
     data,
     sequence,
 )
+from galaxy.datatypes.data import GeneratePrimaryFileDataset
 from galaxy.datatypes.metadata import MetadataElement
 from galaxy.datatypes.sniff import (
     build_sniff_from_prefix,
@@ -19,6 +21,9 @@ from galaxy.datatypes.sniff import (
 )
 from galaxy.datatypes.text import Html
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 
@@ -30,7 +35,7 @@ class Amos(data.Text):
     edam_format = "format_3582"
     file_ext = "afg"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is an amos assembly file format
         Example::
@@ -72,7 +77,7 @@ class Sequences(sequence.Fasta):
     edam_data = "data_0925"
     file_ext = "sequences"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is a velveth produced  fasta format
         The id line has 3 fields separated by tabs: sequence_name  sequence_index category::
@@ -106,7 +111,7 @@ class Roadmaps(data.Text):
     edam_format = "format_2561"
     file_ext = "roadmaps"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is a velveth produced RoadMap::
           142858  21      1
@@ -168,7 +173,7 @@ class Velvet(Html):
             is_binary=False,
         )
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         log.debug(f"Velvet log info  JJ generate_primary_file {dataset}")
         rval = ["<html><head><title>Velvet Galaxy Composite Dataset </title></head><p/>"]
         rval.append("<div>This composite dataset is composed of the following files:<p/><ul>")
@@ -187,7 +192,7 @@ class Velvet(Html):
         rval.append("</ul></div></html>")
         return "\n".join(rval)
 
-    def regenerate_primary_file(self, dataset):
+    def regenerate_primary_file(self, dataset: "DatasetInstance") -> None:
         """
         cannot do this until we are setting metadata
         """
@@ -238,6 +243,6 @@ class Velvet(Html):
             f.write("\n".join(rval))
             f.write("\n")
 
-    def set_meta(self, dataset, **kwd):
-        Html.set_meta(self, dataset, **kwd)
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
+        Html.set_meta(self, dataset, overwrite=overwrite, **kwd)
         self.regenerate_primary_file(dataset)
diff --git a/lib/galaxy/datatypes/binary.py b/lib/galaxy/datatypes/binary.py
index e3d54762ac0..1c1586f0d07 100644
--- a/lib/galaxy/datatypes/binary.py
+++ b/lib/galaxy/datatypes/binary.py
@@ -14,7 +14,12 @@ import tempfile
 import zipfile
 from json import dumps
 from typing import (
+    Any,
+    Dict,
+    Iterable,
+    List,
     Optional,
+    Tuple,
     TYPE_CHECKING,
 )
 
@@ -31,8 +36,24 @@ from galaxy.datatypes import metadata
 from galaxy.datatypes.data import (
     Data,
     DatatypeValidation,
+    GeneratePrimaryFileDataset,
     get_file_peek,
 )
+from galaxy.datatypes.dataproviders.column import (
+    ColumnarDataProvider,
+    DictDataProvider,
+)
+from galaxy.datatypes.dataproviders.dataset import (
+    DatasetDataProvider,
+    SamtoolsDataProvider,
+    SQliteDataDictProvider,
+    SQliteDataProvider,
+    SQliteDataTableProvider,
+)
+from galaxy.datatypes.dataproviders.line import (
+    FilteredLineDataProvider,
+    RegexLineDataProvider,
+)
 from galaxy.datatypes.metadata import (
     DictParameter,
     FileParameter,
@@ -60,7 +81,11 @@ from . import (
 )
 
 if TYPE_CHECKING:
-    from galaxy.model import DatasetInstance
+    from galaxy.model import (
+        DatasetInstance,
+        HistoryDatasetAssociation,
+    )
+    from galaxy.util.compression_utils import FileObjType
 
 log = logging.getLogger(__name__)
 # pysam 0.16.0.1 emits logs containing the word 'Error', this can confuse the stdout/stderr checkers.
@@ -84,7 +109,7 @@ class Binary(data.Data):
     def register_unsniffable_binary_ext(ext):
         """Deprecated method."""
 
-    def set_peek(self, dataset, **kwd):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = "binary data"
@@ -93,7 +118,7 @@ class Binary(data.Data):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Returns the mime type of the datatype"""
         return "application/octet-stream"
 
@@ -105,7 +130,7 @@ class Ab1(Binary):
     edam_format = "format_3000"
     edam_data = "data_0924"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary ab1 sequence file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -113,7 +138,7 @@ class Ab1(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -127,7 +152,7 @@ class Idat(Binary):
     edam_format = "format_2058"
     edam_data = "data_2603"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         try:
             header = open(filename, "rb").read(4)
             if header == b"IDAT":
@@ -151,7 +176,7 @@ class Cel(Binary):
         name="version", default="3", desc="Version", readonly=True, visible=True, optional=True, no_value="3"
     )
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """
         Try to guess if the file is a Cel file.
 
@@ -182,7 +207,7 @@ class Cel(Binary):
             found_cel_3 = True
         return found_cel_3 or found_cel_4 or found_cel_agcc
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set metadata for Cel file.
         """
@@ -195,7 +220,7 @@ class Cel(Binary):
         elif header_bytes.decode("utf8", errors="ignore").startswith("[CEL]"):
             dataset.metadata.version = "3"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.blurb = f"Cel version: {dataset.metadata.version}"
             dataset.peek = get_file_peek(dataset.file_name)
@@ -229,7 +254,7 @@ class CompressedArchive(Binary):
     compressed = True
     is_binary = "maybe"  # type: ignore[assignment]  # https://github.com/python/mypy/issues/8796
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Compressed binary file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -237,7 +262,7 @@ class CompressedArchive(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -249,7 +274,7 @@ class Meryldb(CompressedArchive):
 
     file_ext = "meryldb"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """
         Try to guess if the file is a Cel file.
 
@@ -283,10 +308,10 @@ class Bref3(Binary):
         super().__init__(**kwd)
         self._magic = binascii.unhexlify("7a8874f400156272")
 
-    def sniff_prefix(self, sniff_prefix):
-        return sniff_prefix.startswith_bytes(self._magic)
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
+        return file_prefix.startswith_bytes(self._magic)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary bref3 file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -294,7 +319,7 @@ class Bref3(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -306,7 +331,7 @@ class DynamicCompressedArchive(CompressedArchive):
     compressed_format: str
     uncompressed_datatype_instance: Data
 
-    def matches_any(self, target_datatypes) -> bool:
+    def matches_any(self, target_datatypes: List[Any]) -> bool:
         """Treat two aspects of compressed datatypes separately."""
         compressed_target_datatypes = []
         uncompressed_target_datatypes = []
@@ -346,7 +371,7 @@ class CompressedZipArchive(CompressedArchive):
 
     file_ext = "zip"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Compressed zip file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -354,13 +379,13 @@ class CompressedZipArchive(CompressedArchive):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
             return f"Compressed zip file ({nice_size(dataset.get_size())})"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         with zipfile.ZipFile(filename) as zf:
             zf_files = zf.infolist()
             count = 0
@@ -369,6 +394,7 @@ class CompressedZipArchive(CompressedArchive):
                     count += 1
                 if count > 1:
                     return True
+        return False
 
 
 class GenericAsn1Binary(Binary):
@@ -384,13 +410,13 @@ class _BamOrSam:
     Helper class to set the metadata common to sam and bam files
     """
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         try:
             bam_file = pysam.AlignmentFile(dataset.file_name, mode="rb")
             # TODO: Reference names, lengths, read_groups and headers can become very large, truncate when necessary
             dataset.metadata.reference_names = list(bam_file.references)
             dataset.metadata.reference_lengths = list(bam_file.lengths)
-            dataset.metadata.bam_header = dict(bam_file.header.items())
+            dataset.metadata.bam_header = dict(bam_file.header.items())  # type: ignore [attr-defined]
             dataset.metadata.read_groups = [
                 read_group["ID"] for read_group in dataset.metadata.bam_header.get("RG", []) if "ID" in read_group
             ]
@@ -489,27 +515,27 @@ class BamNative(CompressedArchive, _BamOrSam):
         no_value={},
     )
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         _BamOrSam().set_meta(dataset, overwrite=overwrite, **kwd)
 
     @staticmethod
-    def merge(split_files, output_file):
+    def merge(split_files: List[str], output_file: str) -> None:
         """
         Merges BAM files
 
         :param split_files: List of bam file paths to merge
         :param output_file: Write merged bam file to this location
         """
-        pysam.merge("-O", "BAM", output_file, *split_files)
+        pysam.merge("-O", "BAM", output_file, *split_files)  # type: ignore[attr-defined]
 
-    def init_meta(self, dataset, copy_from=None):
+    def init_meta(self, dataset: "DatasetInstance", copy_from: Optional["DatasetInstance"] = None) -> None:
         Binary.init_meta(self, dataset, copy_from=copy_from)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         return BamNative.is_bam(filename)
 
     @classmethod
-    def is_bam(cls, filename):
+    def is_bam(cls, filename: str) -> bool:
         # BAM is compressed in the BGZF format, and must not be uncompressed in Galaxy.
         # The first 4 bytes of any bam file is 'BAM\1', and the file is binary.
         try:
@@ -520,7 +546,7 @@ class BamNative(CompressedArchive, _BamOrSam):
         except Exception:
             return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary bam alignments file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -528,13 +554,13 @@ class BamNative(CompressedArchive, _BamOrSam):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
             return f"Binary bam alignments file ({nice_size(dataset.get_size())})"
 
-    def to_archive(self, dataset, name=""):
+    def to_archive(self, dataset: "DatasetInstance", name: str = "") -> Iterable:
         rel_paths = []
         file_paths = []
         rel_paths.append(f"{name or dataset.file_name}.{dataset.extension}")
@@ -545,7 +571,7 @@ class BamNative(CompressedArchive, _BamOrSam):
             file_paths.append(dataset.metadata.bam_index.file_name)
         return zip(file_paths, rel_paths)
 
-    def groom_dataset_content(self, file_name):
+    def groom_dataset_content(self, file_name: str) -> None:
         """
         Ensures that the BAM file contents are coordinate-sorted.  This function is called
         on an output dataset after the content is initially generated.
@@ -568,7 +594,7 @@ class BamNative(CompressedArchive, _BamOrSam):
             [f"-@{slots}", file_name, "-T", tmp_sorted_dataset_file_name_prefix, "-O", "BAM", "-o", sorted_file_name]
         )
         try:
-            pysam.sort(*sort_args)
+            pysam.sort(*sort_args)  # type: ignore[attr-defined]
         except Exception:
             shutil.rmtree(tmp_dir, ignore_errors=True)
             raise
@@ -614,7 +640,17 @@ class BamNative(CompressedArchive, _BamOrSam):
             offset = -1
         return dumps({"ck_data": util.unicodify(ck_data), "offset": offset})
 
-    def display_data(self, trans, dataset, preview=False, filename=None, to_ext=None, offset=None, ck_size=None, **kwd):
+    def display_data(
+        self,
+        trans,
+        dataset: "HistoryDatasetAssociation",
+        preview: bool = False,
+        filename: Optional[str] = None,
+        to_ext: Optional[str] = None,
+        offset: Optional[int] = None,
+        ck_size: Optional[int] = None,
+        **kwd,
+    ):
         headers = kwd.get("headers", {})
         preview = util.string_as_bool(preview)
         if offset is not None:
@@ -643,7 +679,7 @@ class BamNative(CompressedArchive, _BamOrSam):
                 headers,
             )
 
-    def validate(self, dataset, **kwd):
+    def validate(self, dataset: "DatasetInstance", **kwd) -> DatatypeValidation:
         if not BamNative.is_bam(dataset.file_name):
             return DatatypeValidation.invalid("This dataset does not appear to a BAM file.")
         elif self.dataset_content_needs_grooming(dataset.file_name):
@@ -682,7 +718,7 @@ class Bam(BamNative):
         optional=True,
     )
 
-    def get_index_flag(self, file_name):
+    def get_index_flag(self, file_name: str) -> str:
         """
         Return pysam flag for bai index (default) or csi index (contig size > (2**29 - 1) )
         """
@@ -696,7 +732,7 @@ class Bam(BamNative):
             pass
         return index_flag
 
-    def dataset_content_needs_grooming(self, file_name):
+    def dataset_content_needs_grooming(self, file_name: str) -> bool:
         """
         Check if file_name is a coordinate-sorted BAM file
         """
@@ -713,13 +749,13 @@ class Bam(BamNative):
                 cmd = [
                     "python",
                     "-c",
-                    f"import pysam; pysam.set_verbosity(0); pysam.index('{file_name}', '{index_name}')",
+                    f"import pysam; pysam.set_verbosity(0); pysam.index('-o', '{index_name}', '{file_name}')",
                 ]
             else:
                 cmd = [
                     "python",
                     "-c",
-                    f"import pysam; pysam.set_verbosity(0); pysam.index('{index_flag}', '{file_name}', '{index_name}')",
+                    f"import pysam; pysam.set_verbosity(0); pysam.index('{index_flag}', '-o', '{index_name}', '{file_name}')",
                 ]
             with open(os.devnull, "w") as devnull:
                 subprocess.check_call(cmd, stderr=devnull, shell=False)
@@ -732,7 +768,9 @@ class Bam(BamNative):
             pass
         return needs_sorting
 
-    def set_meta(self, dataset, overwrite=True, metadata_tmp_files_dir=None, **kwd):
+    def set_meta(
+        self, dataset: "DatasetInstance", overwrite: bool = True, metadata_tmp_files_dir: Optional[str] = None, **kwd
+    ) -> None:
         # These metadata values are not accessible by users, always overwrite
         super().set_meta(dataset=dataset, overwrite=overwrite, **kwd)
         index_flag = self.get_index_flag(dataset.file_name)
@@ -748,13 +786,13 @@ class Bam(BamNative):
             )
         if index_flag == "-b":
             # IOError: No such file or directory: '-b' if index_flag is set to -b (pysam 0.15.4)
-            pysam.index(dataset.file_name, index_file.file_name)
+            pysam.index("-o", index_file.file_name, dataset.file_name)  # type: ignore [attr-defined]
         else:
-            pysam.index(index_flag, dataset.file_name, index_file.file_name)
+            pysam.index(index_flag, "-o", index_file.file_name, dataset.file_name)  # type: ignore [attr-defined]
         dataset.metadata.bam_index = index_file
 
-    def sniff(self, file_name):
-        return super().sniff(file_name) and not self.dataset_content_needs_grooming(file_name)
+    def sniff(self, filename: str) -> bool:
+        return super().sniff(filename) and not self.dataset_content_needs_grooming(filename)
 
     # ------------- Dataproviders
     # pipe through samtools view
@@ -762,29 +800,29 @@ class Bam(BamNative):
     # bam does not use '#' to indicate comments/headers - we need to strip out those headers from the std. providers
     # TODO:?? seems like there should be an easier way to do/inherit this - metadata.comment_char?
     # TODO: incorporate samtools options to control output: regions first, then flags, etc.
-    @dataproviders.decorators.dataprovider_factory("line", dataproviders.line.FilteredLineDataProvider.settings)
-    def line_dataprovider(self, dataset, **settings):
-        samtools_source = dataproviders.dataset.SamtoolsDataProvider(dataset)
+    @dataproviders.decorators.dataprovider_factory("line", FilteredLineDataProvider.settings)
+    def line_dataprovider(self, dataset: "DatasetInstance", **settings) -> FilteredLineDataProvider:
+        samtools_source = SamtoolsDataProvider(dataset)
         settings["comment_char"] = "@"
-        return dataproviders.line.FilteredLineDataProvider(samtools_source, **settings)
+        return FilteredLineDataProvider(samtools_source, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("regex-line", dataproviders.line.RegexLineDataProvider.settings)
-    def regex_line_dataprovider(self, dataset, **settings):
-        samtools_source = dataproviders.dataset.SamtoolsDataProvider(dataset)
+    @dataproviders.decorators.dataprovider_factory("regex-line", RegexLineDataProvider.settings)
+    def regex_line_dataprovider(self, dataset: "DatasetInstance", **settings) -> RegexLineDataProvider:
+        samtools_source = SamtoolsDataProvider(dataset)
         settings["comment_char"] = "@"
-        return dataproviders.line.RegexLineDataProvider(samtools_source, **settings)
+        return RegexLineDataProvider(samtools_source, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("column", dataproviders.column.ColumnarDataProvider.settings)
-    def column_dataprovider(self, dataset, **settings):
-        samtools_source = dataproviders.dataset.SamtoolsDataProvider(dataset)
+    @dataproviders.decorators.dataprovider_factory("column", ColumnarDataProvider.settings)
+    def column_dataprovider(self, dataset: "DatasetInstance", **settings) -> ColumnarDataProvider:
+        samtools_source = SamtoolsDataProvider(dataset)
         settings["comment_char"] = "@"
-        return dataproviders.column.ColumnarDataProvider(samtools_source, **settings)
+        return ColumnarDataProvider(samtools_source, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("dict", dataproviders.column.DictDataProvider.settings)
-    def dict_dataprovider(self, dataset, **settings):
-        samtools_source = dataproviders.dataset.SamtoolsDataProvider(dataset)
+    @dataproviders.decorators.dataprovider_factory("dict", DictDataProvider.settings)
+    def dict_dataprovider(self, dataset: "DatasetInstance", **settings) -> DictDataProvider:
+        samtools_source = SamtoolsDataProvider(dataset)
         settings["comment_char"] = "@"
-        return dataproviders.column.DictDataProvider(samtools_source, **settings)
+        return DictDataProvider(samtools_source, **settings)
 
     # these can't be used directly - may need BamColumn, BamDict (Bam metadata -> column/dict)
     # OR - see genomic_region_dataprovider
@@ -798,21 +836,21 @@ class Bam(BamNative):
     #    settings['comment_char'] = '@'
     #    return super().dataset_dict_dataprovider(dataset, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("header", dataproviders.line.RegexLineDataProvider.settings)
-    def header_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("header", RegexLineDataProvider.settings)
+    def header_dataprovider(self, dataset: "DatasetInstance", **settings) -> RegexLineDataProvider:
         # in this case we can use an option of samtools view to provide just what we need (w/o regex)
-        samtools_source = dataproviders.dataset.SamtoolsDataProvider(dataset, "-H")
-        return dataproviders.line.RegexLineDataProvider(samtools_source, **settings)
+        samtools_source = SamtoolsDataProvider(dataset, "-H")
+        return RegexLineDataProvider(samtools_source, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("id-seq-qual", dataproviders.column.DictDataProvider.settings)
-    def id_seq_qual_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("id-seq-qual", DictDataProvider.settings)
+    def id_seq_qual_dataprovider(self, dataset: "DatasetInstance", **settings) -> DictDataProvider:
         settings["indeces"] = [0, 9, 10]
         settings["column_types"] = ["str", "str", "str"]
         settings["column_names"] = ["id", "seq", "qual"]
         return self.dict_dataprovider(dataset, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("genomic-region", dataproviders.column.ColumnarDataProvider.settings)
-    def genomic_region_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("genomic-region", ColumnarDataProvider.settings)
+    def genomic_region_dataprovider(self, dataset: "DatasetInstance", **settings) -> ColumnarDataProvider:
         # GenomicRegionDataProvider currently requires a dataset as source - may not be necc.
         # TODO:?? consider (at least) the possible use of a kwarg: metadata_source (def. to source.dataset),
         #   or remove altogether...
@@ -825,20 +863,18 @@ class Bam(BamNative):
         settings["column_types"] = ["str", "int", "int"]
         return self.column_dataprovider(dataset, **settings)
 
-    @dataproviders.decorators.dataprovider_factory(
-        "genomic-region-dict", dataproviders.column.DictDataProvider.settings
-    )
-    def genomic_region_dict_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("genomic-region-dict", DictDataProvider.settings)
+    def genomic_region_dict_dataprovider(self, dataset: "DatasetInstance", **settings) -> DictDataProvider:
         settings["indeces"] = [2, 3, 3]
         settings["column_types"] = ["str", "int", "int"]
         settings["column_names"] = ["chrom", "start", "end"]
         return self.dict_dataprovider(dataset, **settings)
 
     @dataproviders.decorators.dataprovider_factory("samtools")
-    def samtools_dataprovider(self, dataset, **settings):
+    def samtools_dataprovider(self, dataset: "DatasetInstance", **settings) -> SamtoolsDataProvider:
         """Generic samtools interface - all options available through settings."""
-        dataset_source = dataproviders.dataset.DatasetDataProvider(dataset)
-        return dataproviders.dataset.SamtoolsDataProvider(dataset_source, **settings)
+        dataset_source = DatasetDataProvider(dataset)
+        return SamtoolsDataProvider(dataset_source, **settings)
 
 
 class ProBam(Bam):
@@ -860,11 +896,11 @@ class BamInputSorted(BamNative):
     sort_flag = "-n"
     file_ext = "qname_input_sorted.bam"
 
-    def sniff(self, file_name):
+    def sniff(self, filename: str) -> bool:
         # We never want to sniff to this datatype
         return False
 
-    def dataset_content_needs_grooming(self, file_name):
+    def dataset_content_needs_grooming(self, file_name: str) -> bool:
         """
         Groom if the file is coordinate sorted
         """
@@ -872,7 +908,7 @@ class BamInputSorted(BamNative):
         # is to actually index them.
         with pysam.AlignmentFile(filename=file_name) as f:
             # The only sure thing we know here is that the sort order can't be coordinate
-            return f.header.get("HD", {}).get("SO") == "coordinate"
+            return f.header.get("HD", {}).get("SO") == "coordinate"  # type: ignore[attr-defined]
 
 
 class BamQuerynameSorted(BamInputSorted):
@@ -881,17 +917,17 @@ class BamQuerynameSorted(BamInputSorted):
     sort_flag = "-n"
     file_ext = "qname_sorted.bam"
 
-    def sniff(self, file_name):
-        return BamNative().sniff(file_name) and not self.dataset_content_needs_grooming(file_name)
+    def sniff(self, filename: str) -> bool:
+        return BamNative().sniff(filename) and not self.dataset_content_needs_grooming(filename)
 
-    def dataset_content_needs_grooming(self, file_name):
+    def dataset_content_needs_grooming(self, file_name: str) -> bool:
         """
         Check if file_name is a queryname-sorted BAM file
         """
         # The best way to ensure that BAM files are coordinate-sorted and indexable
         # is to actually index them.
         with pysam.AlignmentFile(filename=file_name) as f:
-            return f.header.get("HD", {}).get("SO") != "queryname"
+            return f.header.get("HD", {}).get("SO") != "queryname"  # type: ignore[attr-defined]
 
 
 class CRAM(Binary):
@@ -918,7 +954,9 @@ class CRAM(Binary):
         optional=True,
     )
 
-    def set_meta(self, dataset, overwrite=True, metadata_tmp_files_dir=None, **kwd):
+    def set_meta(
+        self, dataset: "DatasetInstance", overwrite: bool = True, metadata_tmp_files_dir: Optional[str] = None, **kwd
+    ) -> None:
         major_version, minor_version = self.get_cram_version(dataset.file_name)
         if major_version != -1:
             dataset.metadata.cram_version = f"{str(major_version)}.{str(minor_version)}"
@@ -930,7 +968,7 @@ class CRAM(Binary):
             if self.set_index_file(dataset, index_file):
                 dataset.metadata.cram_index = index_file
 
-    def get_cram_version(self, filename):
+    def get_cram_version(self, filename: str) -> Tuple[int, int]:
         try:
             with open(filename, "rb") as fh:
                 header = bytearray(fh.read(6))
@@ -939,15 +977,15 @@ class CRAM(Binary):
             log.warning("%s, get_cram_version Exception: %s", self, exc)
             return -1, -1
 
-    def set_index_file(self, dataset, index_file):
+    def set_index_file(self, dataset: "DatasetInstance", index_file) -> bool:
         try:
-            pysam.index(dataset.file_name, index_file.file_name)
+            pysam.index("-o", index_file.file_name, dataset.file_name)  # type: ignore [attr-defined]
             return True
         except Exception as exc:
             log.warning("%s, set_index_file Exception: %s", self, exc)
             return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "CRAM binary alignment file"
             dataset.blurb = "binary data"
@@ -955,7 +993,7 @@ class CRAM(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         try:
             header = open(filename, "rb").read(4)
             if header == b"CRAM":
@@ -988,7 +1026,7 @@ class Bcf(BaseBcf):
         optional=True,
     )
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         # BCF is compressed in the BGZF format, and must not be uncompressed in Galaxy.
         try:
             header = gzip.open(filename).read(3)
@@ -999,7 +1037,9 @@ class Bcf(BaseBcf):
         except Exception:
             return False
 
-    def set_meta(self, dataset, overwrite=True, metadata_tmp_files_dir=None, **kwd):
+    def set_meta(
+        self, dataset: "DatasetInstance", overwrite: bool = True, metadata_tmp_files_dir: Optional[str] = None, **kwd
+    ) -> None:
         """Creates the index for the BCF file."""
         # These metadata values are not accessible by users, always overwrite
         index_file = dataset.metadata.bcf_index
@@ -1041,7 +1081,7 @@ class BcfUncompressed(BaseBcf):
     file_ext = "bcf_uncompressed"
     compressed = False
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         try:
             header = open(filename, mode="rb").read(3)
             # The first 3 bytes of any BCF file are 'BCF', and the file is binary.
@@ -1072,7 +1112,7 @@ class H5(Binary):
         super().__init__(**kwd)
         self._magic = binascii.unhexlify("894844460d0a1a0a")
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         # The first 8 bytes of any hdf5 file are 0x894844460d0a1a0a
         try:
             header = open(filename, "rb").read(8)
@@ -1082,7 +1122,7 @@ class H5(Binary):
         except Exception:
             return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary HDF5 file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -1090,7 +1130,7 @@ class H5(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -1174,7 +1214,7 @@ class Loom(H5):
         readonly=True,
     )
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
             with h5py.File(filename, "r") as loom_file:
                 # Check the optional but distinctive LOOM_SPEC_VERSION attribute
@@ -1188,7 +1228,7 @@ class Loom(H5):
                     return True
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary Loom file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -1196,13 +1236,13 @@ class Loom(H5):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
             return f"Binary Loom file ({nice_size(dataset.get_size())})"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
         try:
             with h5py.File(dataset.file_name, "r") as loom_file:
@@ -1338,7 +1378,7 @@ class Anndata(H5):
         no_value=(0, 0),
     )
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
             try:
                 with h5py.File(filename, "r") as f:
@@ -1347,7 +1387,7 @@ class Anndata(H5):
                 return False
         return False
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
         with h5py.File(dataset.file_name, "r") as anndata_file:
             dataset.metadata.title = anndata_file.attrs.get("title")
@@ -1453,7 +1493,7 @@ class Anndata(H5):
             if dataset.metadata.shape is None:
                 dataset.metadata.shape = (int(dataset.metadata.obs_size), int(dataset.metadata.var_size))
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             tmp = dataset.metadata
 
@@ -1481,7 +1521,7 @@ class Anndata(H5):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -1513,7 +1553,7 @@ class Grib(Binary):
         super().__init__(**kwd)
         self._magic = b"GRIB"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         # The first 4 bytes of any GRIB file are GRIB
         try:
             if file_prefix.startswith_bytes(self._magic):
@@ -1526,7 +1566,7 @@ class Grib(Binary):
         except Exception:
             return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary GRIB file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -1534,19 +1574,19 @@ class Grib(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
             return f"Binary GRIB file ({nice_size(dataset.get_size())})"
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the GRIB edition.
         """
         dataset.metadata.grib_edition = self._get_grib_edition(dataset.file_name)
 
-    def _get_grib_edition(self, filename):
+    def _get_grib_edition(self, filename: str) -> int:
         _uint8struct = struct.Struct(b">B")
         edition = 0
         with open(filename, "rb") as f:
@@ -1565,11 +1605,11 @@ class GmxBinary(Binary):
     magic_number: Optional[int] = None  # variables to be overwritten in the child class
     file_ext = ""
 
-    def sniff_prefix(self, sniff_prefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         # The first 4 bytes of any GROMACS binary file containing the magic number
-        return sniff_prefix.magic_header(">1i") == self.magic_number
+        return file_prefix.magic_header(">1i") == self.magic_number
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = f"Binary GROMACS {self.file_ext} file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -1577,7 +1617,7 @@ class GmxBinary(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -1688,7 +1728,7 @@ class Biom2(H5):
     file_ext = "biom2"
     edam_format = "format_3746"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """
         >>> from galaxy.datatypes.sniff import get_test_fname
         >>> fname = get_test_fname('biom2_sparse_otu_table_hdf5.biom2')
@@ -1707,7 +1747,7 @@ class Biom2(H5):
                 return required_fields.issubset(f.attrs.keys())
         return False
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
         try:
             with h5py.File(dataset.file_name, "r") as f:
@@ -1729,7 +1769,7 @@ class Biom2(H5):
         except Exception as e:
             log.warning("%s, set_meta Exception: %s", self, util.unicodify(e))
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             lines = ["Biom2 (HDF5) file"]
             try:
@@ -1744,7 +1784,7 @@ class Biom2(H5):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -1758,7 +1798,7 @@ class Cool(H5):
 
     file_ext = "cool"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """
         >>> from galaxy.datatypes.sniff import get_test_fname
         >>> fname = get_test_fname('matrix.cool')
@@ -1789,7 +1829,7 @@ class Cool(H5):
                     return True
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Cool (HDF5) file for storing genomic interaction data."
             dataset.blurb = nice_size(dataset.get_size())
@@ -1797,7 +1837,7 @@ class Cool(H5):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -1811,7 +1851,7 @@ class MCool(H5):
 
     file_ext = "mcool"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """
         >>> from galaxy.datatypes.sniff import get_test_fname
         >>> fname = get_test_fname('matrix.mcool')
@@ -1849,7 +1889,7 @@ class MCool(H5):
                     return True
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Multi-resolution Cool (HDF5) file for storing genomic interaction data."
             dataset.blurb = nice_size(dataset.get_size())
@@ -1857,7 +1897,7 @@ class MCool(H5):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -1870,11 +1910,18 @@ class H5MLM(H5):
     """
 
     file_ext = "h5mlm"
-    URL = "https://github.com/goeckslab/Galaxy-ML"
+    TARGET_URL = "https://github.com/goeckslab/Galaxy-ML"
 
     max_peek_size = 1000  # 1 KB
     max_preview_size = 1000000  # 1 MB
 
+    # reserved keys
+    CONFIG = "-model_config-"
+    HTTP_REPR = "-http_repr-"
+    HYPERPARAMETER = "-model_hyperparameters-"
+    REPR = "-repr-"
+    URL = "-URL-"
+
     MetadataElement(
         name="hyper_params",
         desc="Hyperparameter File",
@@ -1885,7 +1932,9 @@ class H5MLM(H5):
         optional=True,
     )
 
-    def set_meta(self, dataset, overwrite=True, metadata_tmp_files_dir=None, **kwd):
+    def set_meta(
+        self, dataset: "DatasetInstance", overwrite: bool = True, metadata_tmp_files_dir: Optional[str] = None, **kwd
+    ) -> None:
         try:
             spec_key = "hyper_params"
             params_file = dataset.metadata.hyper_params
@@ -1894,7 +1943,7 @@ class H5MLM(H5):
                     dataset=dataset, metadata_tmp_files_dir=metadata_tmp_files_dir
                 )
             with h5py.File(dataset.file_name, "r") as handle:
-                hyper_params = handle["-model_hyperparameters-"][()]
+                hyper_params = handle[self.HYPERPARAMETER][()]
             hyper_params = json.loads(util.unicodify(hyper_params))
             with open(params_file.file_name, "w") as f:
                 f.write("\tParameter\tValue\n")
@@ -1904,51 +1953,73 @@ class H5MLM(H5):
         except Exception as e:
             log.warning("%s, set_meta Exception: %s", self, e)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
-            keys = ["-model_config-"]
+            keys = [self.CONFIG]
             with h5py.File(filename, "r") as handle:
                 if not all(name in handle.keys() for name in keys):
                     return False
-                url = util.unicodify(handle.attrs.get("-URL-"))
-            if url == self.URL:
+                url = util.unicodify(handle.attrs.get(self.URL))
+            if url == self.TARGET_URL:
                 return True
         return False
 
-    def get_repr(self, filename):
+    def get_attribute(self, filename: str, attr_key: str) -> str:
         try:
             with h5py.File(filename, "r") as handle:
-                repr_ = util.unicodify(handle.attrs.get("-repr-"))
-            return repr_
+                attr = util.unicodify(handle.attrs.get(attr_key))
+            return attr
         except Exception as e:
-            log.warning("%s, get_repr Except: %s", self, e)
+            log.warning("%s, get_attribute Except: %s", self, e)
             return ""
 
-    def get_config_string(self, filename):
+    def get_repr(self, filename: str) -> str:
+        repr = self.get_attribute(filename, self.REPR)
+        if len(repr) <= self.max_preview_size:
+            return repr
+        else:
+            return "<p><strong>The model representation is too big to be displayed!</strong></p>"
+
+    def get_html_repr(self, filename: str) -> str:
+        repr = self.get_attribute(filename, self.HTTP_REPR)
+        if len(repr) <= self.max_preview_size:
+            return repr
+        else:
+            return "<p><strong>The model diagram is too big to be displayed!</strong></p>"
+
+    def get_config_string(self, filename: str) -> str:
         try:
             with h5py.File(filename, "r") as handle:
-                config = util.unicodify(handle["-model_config-"][()])
+                config = util.unicodify(handle[self.CONFIG][()])
             return config
         except Exception as e:
             log.warning("%s, get model configuration Except: %s", self, e)
             return ""
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
-            repr_ = self.get_repr(dataset.file_name)
-            dataset.peek = repr_[: self.max_peek_size]
+            repr = self.get_repr(dataset.file_name)
+            dataset.peek = repr[: self.max_peek_size]
             dataset.blurb = nice_size(dataset.get_size())
         else:
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
             return "HDF5 Model (%s)" % (nice_size(dataset.get_size()))
 
-    def display_data(self, trans, dataset, preview=False, filename=None, to_ext=None, **kwd):
+    def display_data(
+        self,
+        trans,
+        dataset: "HistoryDatasetAssociation",
+        preview: bool = False,
+        filename: Optional[str] = None,
+        to_ext: Optional[str] = None,
+        **kwd,
+    ):
         headers = kwd.get("headers", {})
         preview = util.string_as_bool(preview)
 
@@ -1956,24 +2027,25 @@ class H5MLM(H5):
             to_ext = to_ext or dataset.extension
             return self._serve_raw(dataset, to_ext, headers, **kwd)
 
-        rval = {}
+        out_dict: Dict = {}
         try:
             with h5py.File(dataset.file_name, "r") as handle:
-                rval["Attributes"] = {}
+                out_dict["Attributes"] = {}
                 attributes = handle.attrs
-                for k in set(attributes.keys()) - {"-URL-", "-repr-"}:
-                    rval["Attributes"][k] = util.unicodify(attributes.get(k))
+                for k in set(attributes.keys()) - {self.HTTP_REPR, self.REPR, self.URL}:
+                    out_dict["Attributes"][k] = util.unicodify(attributes.get(k))
         except Exception as e:
             log.warning(e)
 
         config = self.get_config_string(dataset.file_name)
-        rval["Config"] = json.loads(config) if config else ""
-        rval = json.dumps(rval, sort_keys=True, indent=2)
-        rval = rval[: self.max_preview_size]
+        out_dict["Config"] = json.loads(config) if config else ""
+        out = json.dumps(out_dict, sort_keys=True, indent=2)
+        out = out[: self.max_preview_size]
 
-        repr_ = self.get_repr(dataset.file_name)
+        repr = self.get_repr(dataset.file_name)
+        html_repr = self.get_html_repr(dataset.file_name)
 
-        return f"<pre>{repr_}</pre><pre>{rval}</pre>", headers
+        return f"<div>{html_repr}</div><div><pre>{repr}</pre></div><div><pre>{out}</pre></div>", headers
 
 
 class LudwigModel(Html):
@@ -1994,7 +2066,7 @@ class LudwigModel(Html):
             "training_progress.json", description="Training progress", is_binary=False, optional=True
         )
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         rval = ["<html><head><title>Ludwig Model Composite Dataset.</title></head><p/>"]
         rval.append("<div>This model dataset is composed of the following items:<p/><ul>")
         for composite_name, composite_file in self.get_composite_files(dataset=dataset).items():
@@ -2044,7 +2116,7 @@ class HexrdMaterials(H5):
         no_value={},
     )
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
             req = {"AtomData", "Atomtypes", "CrystalSystem", "LatticeParameters"}
             with h5py.File(filename, "r") as mat_file:
@@ -2053,7 +2125,7 @@ class HexrdMaterials(H5):
                         return True
         return False
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
         try:
             with h5py.File(dataset.file_name, "r") as mat_file:
@@ -2070,7 +2142,7 @@ class HexrdMaterials(H5):
         except Exception as e:
             log.warning("%s, set_meta Exception: %s", self, e)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             lines = ["Material SpaceGroup Lattice"]
             if dataset.metadata.materials:
@@ -2095,7 +2167,7 @@ class Scf(Binary):
     edam_data = "data_0924"
     file_ext = "scf"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary scf sequence file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -2103,7 +2175,7 @@ class Scf(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -2118,12 +2190,12 @@ class Sff(Binary):
     edam_data = "data_0924"
     file_ext = "sff"
 
-    def sniff_prefix(self, sniff_prefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         # The first 4 bytes of any sff file is '.sff', and the file is binary. For details
         # about the format, see http://www.ncbi.nlm.nih.gov/Traces/trace.cgi?cmd=show&f=formats&m=doc&s=format
-        return sniff_prefix.startswith_bytes(b".sff")
+        return file_prefix.startswith_bytes(b".sff")
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary sff file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -2131,7 +2203,7 @@ class Sff(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -2157,10 +2229,10 @@ class BigWig(Binary):
         self._magic = 0x888FFC26
         self._name = "BigWig"
 
-    def sniff_prefix(self, sniff_prefix):
-        return sniff_prefix.magic_header("I") == self._magic
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
+        return file_prefix.magic_header("I") == self._magic
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = f"Binary UCSC {self._name} file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -2168,7 +2240,7 @@ class BigWig(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -2197,18 +2269,18 @@ class TwoBit(Binary):
     edam_data = "data_0848"
     file_ext = "twobit"
 
-    def sniff_prefix(self, sniff_prefix):
-        magic = sniff_prefix.magic_header(">L")
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
+        magic = file_prefix.magic_header(">L")
         return magic == TWOBIT_MAGIC_NUMBER or magic == TWOBIT_MAGIC_NUMBER_SWAP
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary TwoBit format nucleotide file"
             dataset.blurb = nice_size(dataset.get_size())
         else:
             return super().set_peek(dataset)
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -2243,10 +2315,10 @@ class SQlite(Binary):
     file_ext = "sqlite"
     edam_format = "format_3621"
 
-    def init_meta(self, dataset, copy_from=None):
+    def init_meta(self, dataset: "DatasetInstance", copy_from: Optional["DatasetInstance"] = None) -> None:
         Binary.init_meta(self, dataset, copy_from=copy_from)
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         try:
             tables = []
             columns = dict()
@@ -2276,7 +2348,7 @@ class SQlite(Binary):
         except Exception as exc:
             log.warning("%s, set_meta Exception: %s", self, exc)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         # The first 16 bytes of any SQLite3 database file is 'SQLite format 3\0', and the file is binary. For details
         # about the format, see http://www.sqlite.org/fileformat.html
         try:
@@ -2287,7 +2359,7 @@ class SQlite(Binary):
         except Exception:
             return False
 
-    def sniff_table_names(self, filename, table_names):
+    def sniff_table_names(self, filename: str, table_names: Iterable) -> bool:
         # All table names should be in the schema
         try:
             conn = sqlite.connect(filename)
@@ -2303,7 +2375,7 @@ class SQlite(Binary):
             log.warning("%s, sniff Exception: %s", self, e)
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "SQLite Database"
             lines = ["SQLite Database"]
@@ -2319,28 +2391,26 @@ class SQlite(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
             return f"SQLite Database ({nice_size(dataset.get_size())})"
 
-    @dataproviders.decorators.dataprovider_factory("sqlite", dataproviders.dataset.SQliteDataProvider.settings)
-    def sqlite_dataprovider(self, dataset, **settings):
-        dataset_source = dataproviders.dataset.DatasetDataProvider(dataset)
-        return dataproviders.dataset.SQliteDataProvider(dataset_source, **settings)
+    @dataproviders.decorators.dataprovider_factory("sqlite", SQliteDataProvider.settings)
+    def sqlite_dataprovider(self, dataset: "DatasetInstance", **settings) -> SQliteDataProvider:
+        dataset_source = DatasetDataProvider(dataset)
+        return SQliteDataProvider(dataset_source, **settings)
 
-    @dataproviders.decorators.dataprovider_factory(
-        "sqlite-table", dataproviders.dataset.SQliteDataTableProvider.settings
-    )
-    def sqlite_datatableprovider(self, dataset, **settings):
-        dataset_source = dataproviders.dataset.DatasetDataProvider(dataset)
-        return dataproviders.dataset.SQliteDataTableProvider(dataset_source, **settings)
+    @dataproviders.decorators.dataprovider_factory("sqlite-table", SQliteDataTableProvider.settings)
+    def sqlite_datatableprovider(self, dataset: "DatasetInstance", **settings) -> SQliteDataTableProvider:
+        dataset_source = DatasetDataProvider(dataset)
+        return SQliteDataTableProvider(dataset_source, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("sqlite-dict", dataproviders.dataset.SQliteDataDictProvider.settings)
-    def sqlite_datadictprovider(self, dataset, **settings):
-        dataset_source = dataproviders.dataset.DatasetDataProvider(dataset)
-        return dataproviders.dataset.SQliteDataDictProvider(dataset_source, **settings)
+    @dataproviders.decorators.dataprovider_factory("sqlite-dict", SQliteDataDictProvider.settings)
+    def sqlite_datadictprovider(self, dataset: "DatasetInstance", **settings) -> SQliteDataDictProvider:
+        dataset_source = DatasetDataProvider(dataset)
+        return SQliteDataDictProvider(dataset_source, **settings)
 
 
 class GeminiSQLite(SQlite):
@@ -2359,7 +2429,7 @@ class GeminiSQLite(SQlite):
     edam_format = "format_3622"
     edam_data = "data_3498"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
         try:
             conn = sqlite.connect(dataset.file_name)
@@ -2372,7 +2442,7 @@ class GeminiSQLite(SQlite):
         except Exception as e:
             log.warning("%s, set_meta Exception: %s", self, e)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
             table_names = [
                 "gene_detailed",
@@ -2388,7 +2458,7 @@ class GeminiSQLite(SQlite):
             return self.sniff_table_names(filename, table_names)
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Gemini SQLite Database, version %s" % (dataset.metadata.gemini_version or "unknown")
             dataset.blurb = nice_size(dataset.get_size())
@@ -2396,7 +2466,7 @@ class GeminiSQLite(SQlite):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -2408,10 +2478,10 @@ class ChiraSQLite(SQlite):
 
     file_ext = "chira.sqlite"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
             self.sniff_table_names(filename, ["Chimeras"])
         return False
@@ -2439,7 +2509,7 @@ class CuffDiffSQlite(SQlite):
     # TODO: Update this when/if there is a specific EDAM format for CuffDiff SQLite data.
     edam_format = "format_3621"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
         try:
             genes = []
@@ -2468,14 +2538,14 @@ class CuffDiffSQlite(SQlite):
         except Exception as e:
             log.warning("%s, set_meta Exception: %s", self, e)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
             # These tables should be in any CuffDiff SQLite output.
             table_names = ["CDS", "genes", "isoforms", "replicates", "runInfo", "samples", "TSS"]
             return self.sniff_table_names(filename, table_names)
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "CuffDiff SQLite Database, version %s" % (dataset.metadata.cuffdiff_version or "unknown")
             dataset.blurb = nice_size(dataset.get_size())
@@ -2483,7 +2553,7 @@ class CuffDiffSQlite(SQlite):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -2495,10 +2565,10 @@ class MzSQlite(SQlite):
 
     file_ext = "mz.sqlite"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
             table_names = [
                 "DBSequence",
@@ -2532,10 +2602,10 @@ class PQP(SQlite):
 
     file_ext = "pqp"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """
         table definition according to https://github.com/grosenberger/OpenMS/blob/develop/src/openms/source/ANALYSIS/OPENSWATH/TransitionPQPFile.cpp#L264
         for now VERSION GENE PEPTIDE_GENE_MAPPING are excluded, since
@@ -2574,10 +2644,10 @@ class OSW(SQlite):
 
     file_ext = "osw"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         # osw seems to be an extension of pqp (few tables are added)
         # see also here https://github.com/OpenMS/OpenMS/issues/4365
         if not super().sniff(filename):
@@ -2617,10 +2687,10 @@ class SQmass(SQlite):
 
     file_ext = "sqmass"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
             table_names = ["CHROMATOGRAM", "PRECURSOR", "RUN", "SPECTRUM", "DATA", "PRODUCT", "RUN_EXTRA"]
             return self.sniff_table_names(filename, table_names)
@@ -2641,7 +2711,7 @@ class BlibSQlite(SQlite):
     )
     file_ext = "blib"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
         try:
             conn = sqlite.connect(dataset.file_name)
@@ -2652,7 +2722,7 @@ class BlibSQlite(SQlite):
         except Exception as e:
             log.warning("%s, set_meta Exception: %s", self, e)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
             table_names = [
                 "IonMobilityTypes",
@@ -2694,7 +2764,7 @@ class DlibSQlite(SQlite):
     )
     file_ext = "dlib"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
         try:
             conn = sqlite.connect(dataset.file_name)
@@ -2705,7 +2775,7 @@ class DlibSQlite(SQlite):
         except Exception as e:
             log.warning("%s, set_meta Exception: %s", self, e)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
             table_names = ["entries", "metadata", "peptidetoprotein"]
             return self.sniff_table_names(filename, table_names)
@@ -2738,7 +2808,7 @@ class ElibSQlite(SQlite):
     )
     file_ext = "elib"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
         try:
             conn = sqlite.connect(dataset.file_name)
@@ -2749,7 +2819,7 @@ class ElibSQlite(SQlite):
         except Exception as e:
             log.warning("%s, set_meta Exception: %s", self, e)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
             table_names = [
                 "entries",
@@ -2789,10 +2859,10 @@ class IdpDB(SQlite):
 
     file_ext = "idpdb"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
             table_names = [
                 "About",
@@ -2805,7 +2875,7 @@ class IdpDB(SQlite):
             return self.sniff_table_names(filename, table_names)
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "IDPickerDB SQLite file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -2813,7 +2883,7 @@ class IdpDB(SQlite):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -2834,7 +2904,7 @@ class GAFASQLite(SQlite):
     )
     file_ext = "gafa.sqlite"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
         try:
             conn = sqlite.connect(dataset.file_name)
@@ -2849,7 +2919,7 @@ class GAFASQLite(SQlite):
         except Exception as e:
             log.warning("%s, set_meta Exception: %s", self, e)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
             table_names = frozenset({"gene", "gene_family", "gene_family_member", "meta", "transcript"})
             return self.sniff_table_names(filename, table_names)
@@ -2880,7 +2950,7 @@ class NcbiTaxonomySQlite(SQlite):
 
     file_ext = "ncbitaxonomy.sqlite"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
         try:
             conn = sqlite.connect(dataset.file_name)
@@ -2898,13 +2968,13 @@ class NcbiTaxonomySQlite(SQlite):
         except Exception as e:
             log.warning("%s, set_meta Exception: %s", self, e)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
             table_names = frozenset({"__diesel_schema_migrations", "taxonomy"})
             return self.sniff_table_names(filename, table_names)
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "NCBI Taxonomy SQLite Database, version {} ({} taxons)".format(
                 getattr(dataset.metadata, "ncbitaxonomy_schema_version", "unknown"),
@@ -2915,7 +2985,7 @@ class NcbiTaxonomySQlite(SQlite):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -2932,9 +3002,9 @@ class Xlsx(Binary):
     file_ext = "xlsx"
     compressed = True
 
-    def sniff_prefix(self, sniff_prefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         # Xlsx is compressed in zip format and must not be uncompressed in Galaxy.
-        return sniff_prefix.compressed_mime_type == "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+        return file_prefix.compressed_mime_type == "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
 
 
 @build_sniff_from_prefix
@@ -2944,14 +3014,14 @@ class ExcelXls(Binary):
     file_ext = "excel.xls"
     edam_format = "format_3468"
 
-    def sniff_prefix(self, sniff_prefix):
-        return sniff_prefix.mime_type == self.get_mime()
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
+        return file_prefix.mime_type == self.get_mime()
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Returns the mime type of the datatype"""
         return "application/vnd.ms-excel"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Microsoft Excel XLS file"
             dataset.blurb = data.nice_size(dataset.get_size())
@@ -2959,7 +3029,7 @@ class ExcelXls(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -2972,13 +3042,13 @@ class Sra(Binary):
 
     file_ext = "sra"
 
-    def sniff_prefix(self, sniff_prefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """The first 8 bytes of any NCBI sra file is 'NCBI.sra', and the file is binary.
         For details about the format, see http://www.ncbi.nlm.nih.gov/books/n/helpsra/SRA_Overview_BK/#SRA_Overview_BK.4_SRA_Data_Structure
         """
-        return sniff_prefix.startswith_bytes(b"NCBI.sra")
+        return file_prefix.startswith_bytes(b"NCBI.sra")
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary sra file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -2986,7 +3056,7 @@ class Sra(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -3027,7 +3097,7 @@ class RData(CompressedArchive):
         optional=False,
     )
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
         _, fh = compression_utils.get_fileobj_raw(dataset.file_name, "rb")
         try:
@@ -3037,10 +3107,10 @@ class RData(CompressedArchive):
         finally:
             fh.close()
 
-    def sniff_prefix(self, sniff_prefix):
-        return sniff_prefix.startswith_bytes((self.VERSION_2_PREFIX, self.VERSION_3_PREFIX))
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
+        return file_prefix.startswith_bytes((self.VERSION_2_PREFIX, self.VERSION_3_PREFIX))
 
-    def _parse_rdata_header(self, fh):
+    def _parse_rdata_header(self, fh: "FileObjType") -> str:
         header = fh.read(7)
         if header == self.VERSION_2_PREFIX:
             return "2"
@@ -3110,7 +3180,7 @@ class RDS(CompressedArchive):
         optional=False,
     )
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
         _, fh = compression_utils.get_fileobj_raw(dataset.file_name, "rb")
         try:
@@ -3125,9 +3195,9 @@ class RDS(CompressedArchive):
         finally:
             fh.close()
 
-    def sniff_prefix(self, sniff_prefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         try:
-            self._parse_rds_header(sniff_prefix.contents_header_bytes[:14])
+            self._parse_rds_header(file_prefix.contents_header_bytes[:14])
         except Exception:
             return False
         return True
@@ -3164,7 +3234,7 @@ class RDS(CompressedArchive):
 
 class OxliBinary(Binary):
     @staticmethod
-    def _sniff(filename, oxlitype):
+    def _sniff(filename: str, oxlitype: bytes) -> bool:
         try:
             with open(filename, "rb") as fileobj:
                 header = fileobj.read(4)
@@ -3200,7 +3270,7 @@ class OxliCountGraph(OxliBinary):
 
     file_ext = "oxlicg"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         return OxliBinary._sniff(filename, b"01")
 
 
@@ -3226,7 +3296,7 @@ class OxliNodeGraph(OxliBinary):
 
     file_ext = "oxling"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         return OxliBinary._sniff(filename, b"02")
 
 
@@ -3253,7 +3323,7 @@ class OxliTagSet(OxliBinary):
 
     file_ext = "oxlits"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         return OxliBinary._sniff(filename, b"03")
 
 
@@ -3275,7 +3345,7 @@ class OxliStopTags(OxliBinary):
 
     file_ext = "oxlist"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         return OxliBinary._sniff(filename, b"04")
 
 
@@ -3302,7 +3372,7 @@ class OxliSubset(OxliBinary):
 
     file_ext = "oxliss"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         return OxliBinary._sniff(filename, b"05")
 
 
@@ -3330,7 +3400,7 @@ class OxliGraphLabels(OxliBinary):
 
     file_ext = "oxligl"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         return OxliBinary._sniff(filename, b"06")
 
 
@@ -3357,7 +3427,7 @@ class PostgresqlArchive(CompressedArchive):
     )
     file_ext = "postgresql"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
         try:
             if dataset and tarfile.is_tarfile(dataset.file_name):
@@ -3369,13 +3439,13 @@ class PostgresqlArchive(CompressedArchive):
         except Exception as e:
             log.warning("%s, set_meta Exception: %s", self, util.unicodify(e))
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if filename and tarfile.is_tarfile(filename):
             with tarfile.open(filename, "r") as temptar:
                 return "postgresql/db/PG_VERSION" in temptar.getnames()
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = f"PostgreSQL Archive ({nice_size(dataset.get_size())})"
             dataset.blurb = "PostgreSQL version %s" % (dataset.metadata.version or "unknown")
@@ -3383,7 +3453,7 @@ class PostgresqlArchive(CompressedArchive):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -3405,7 +3475,7 @@ class Fast5Archive(CompressedArchive):
     )
     file_ext = "fast5.tar"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
         try:
             if dataset and tarfile.is_tarfile(dataset.file_name):
@@ -3414,7 +3484,7 @@ class Fast5Archive(CompressedArchive):
         except Exception as e:
             log.warning("%s, set_meta Exception: %s", self, e)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         try:
             if filename and tarfile.is_tarfile(filename):
                 with tarfile.open(filename, "r") as temptar:
@@ -3429,7 +3499,7 @@ class Fast5Archive(CompressedArchive):
             log.warning("%s, sniff Exception: %s", self, e)
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = f"FAST5 Archive ({nice_size(dataset.get_size())})"
             dataset.blurb = "%s sequences" % (dataset.metadata.fast5_count or "unknown")
@@ -3437,7 +3507,7 @@ class Fast5Archive(CompressedArchive):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -3462,7 +3532,7 @@ class Fast5ArchiveGz(Fast5Archive):
 
     file_ext = "fast5.tar.gz"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if not is_gzip(filename):
             return False
         return Fast5Archive.sniff(self, filename)
@@ -3486,7 +3556,7 @@ class Fast5ArchiveBz2(Fast5Archive):
 
     file_ext = "fast5.tar.bz2"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if not is_bz2(filename):
             return False
         return Fast5Archive.sniff(self, filename)
@@ -3513,7 +3583,7 @@ class SearchGuiArchive(CompressedArchive):
     )
     file_ext = "searchgui_archive"
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
         try:
             if dataset and zipfile.is_zipfile(dataset.file_name):
@@ -3528,7 +3598,7 @@ class SearchGuiArchive(CompressedArchive):
         except Exception as e:
             log.warning("%s, set_meta Exception: %s", self, e)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         try:
             if filename and zipfile.is_zipfile(filename):
                 with zipfile.ZipFile(filename, "r") as tempzip:
@@ -3538,7 +3608,7 @@ class SearchGuiArchive(CompressedArchive):
             log.warning("%s, sniff Exception: %s", self, e)
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "SearchGUI Archive, version %s" % (dataset.metadata.searchgui_version or "unknown")
             dataset.blurb = nice_size(dataset.get_size())
@@ -3546,7 +3616,7 @@ class SearchGuiArchive(CompressedArchive):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -3561,7 +3631,7 @@ class NetCDF(Binary):
     edam_format = "format_3650"
     edam_data = "data_0943"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary netCDF file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -3569,14 +3639,14 @@ class NetCDF(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
             return f"Binary netCDF file ({nice_size(dataset.get_size())})"
 
-    def sniff_prefix(self, sniff_prefix):
-        return sniff_prefix.startswith_bytes(b"CDF")
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
+        return file_prefix.startswith_bytes(b"CDF")
 
 
 class Dcd(Binary):
@@ -3599,7 +3669,7 @@ class Dcd(Binary):
         super().__init__(**kwd)
         self._magic_number = b"CORD"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         # Match the keyword 'CORD' at position 4 or 8 - intsize dependent
         # Not checking for endianness
         try:
@@ -3617,7 +3687,7 @@ class Dcd(Binary):
         except Exception:
             return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary CHARMM/NAMD dcd file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -3625,7 +3695,7 @@ class Dcd(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -3651,7 +3721,7 @@ class Vel(Binary):
         super().__init__(**kwd)
         self._magic_number = b"VELD"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         # Match the keyword 'VELD' at position 4 or 8 - intsize dependent
         # Not checking for endianness
         try:
@@ -3669,7 +3739,7 @@ class Vel(Binary):
         except Exception:
             return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary CHARMM velocity file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -3677,7 +3747,7 @@ class Vel(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -3704,9 +3774,9 @@ class DAA(Binary):
         super().__init__(**kwd)
         self._magic = binascii.unhexlify("6be33e6d47530e3c")
 
-    def sniff_prefix(self, sniff_prefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         # The first 8 bytes of any daa file are 0x3c0e53476d3ee36b
-        return sniff_prefix.startswith_bytes(self._magic)
+        return file_prefix.startswith_bytes(self._magic)
 
 
 @build_sniff_from_prefix
@@ -3729,8 +3799,8 @@ class RMA6(Binary):
         super().__init__(**kwd)
         self._magic = binascii.unhexlify("000003f600000006")
 
-    def sniff_prefix(self, sniff_prefix):
-        return sniff_prefix.startswith_bytes(self._magic)
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
+        return file_prefix.startswith_bytes(self._magic)
 
 
 @build_sniff_from_prefix
@@ -3753,9 +3823,9 @@ class DMND(Binary):
         super().__init__(**kwd)
         self._magic = binascii.unhexlify("6d18ee15a4f84a02")
 
-    def sniff_prefix(self, sniff_prefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         # The first 8 bytes of any dmnd file are 0x24af8a415ee186d
-        return sniff_prefix.startswith_bytes(self._magic)
+        return file_prefix.startswith_bytes(self._magic)
 
 
 class ICM(Binary):
@@ -3766,7 +3836,7 @@ class ICM(Binary):
     file_ext = "icm"
     edam_data = "data_0950"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary ICM (interpolated context model) file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -3774,8 +3844,8 @@ class ICM(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff(self, dataset):
-        line = open(dataset).read(100)
+    def sniff(self, filename: str) -> bool:
+        line = open(filename).read(100)
         if (
             ">ver = " in line
             and "len = " in line
@@ -3808,8 +3878,8 @@ class Parquet(Binary):
         super().__init__(**kwd)
         self._magic = b"PAR1"  # Defined at https://parquet.apache.org/documentation/latest/
 
-    def sniff_prefix(self, sniff_prefix):
-        return sniff_prefix.startswith_bytes(self._magic)
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
+        return file_prefix.startswith_bytes(self._magic)
 
 
 class BafTar(CompressedArchive):
@@ -3829,19 +3899,19 @@ class BafTar(CompressedArchive):
     edam_format = "format_3712"  # TODO: add more raw formats to EDAM?
     file_ext = "brukerbaf.d.tar"
 
-    def get_signature_file(self):
+    def get_signature_file(self) -> str:
         return "analysis.baf"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if tarfile.is_tarfile(filename):
             with tarfile.open(filename) as rawtar:
                 return self.get_signature_file() in [os.path.basename(f).lower() for f in rawtar.getnames()]
         return False
 
-    def get_type(self):
+    def get_type(self) -> str:
         return "Bruker BAF directory archive"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = self.get_type()
             dataset.blurb = nice_size(dataset.get_size())
@@ -3849,7 +3919,7 @@ class BafTar(CompressedArchive):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -3861,10 +3931,10 @@ class YepTar(BafTar):
 
     file_ext = "agilentbrukeryep.d.tar"
 
-    def get_signature_file(self):
+    def get_signature_file(self) -> str:
         return "analysis.yep"
 
-    def get_type(self):
+    def get_type(self) -> str:
         return "Agilent/Bruker YEP directory archive"
 
 
@@ -3873,10 +3943,10 @@ class TdfTar(BafTar):
 
     file_ext = "brukertdf.d.tar"
 
-    def get_signature_file(self):
+    def get_signature_file(self) -> str:
         return "analysis.tdf"
 
-    def get_type(self):
+    def get_type(self) -> str:
         return "Bruker TDF directory archive"
 
 
@@ -3885,10 +3955,10 @@ class MassHunterTar(BafTar):
 
     file_ext = "agilentmasshunter.d.tar"
 
-    def get_signature_file(self):
+    def get_signature_file(self) -> str:
         return "msscan.bin"
 
-    def get_type(self):
+    def get_type(self) -> str:
         return "Agilent MassHunter directory archive"
 
 
@@ -3897,10 +3967,10 @@ class MassLynxTar(BafTar):
 
     file_ext = "watersmasslynx.raw.tar"
 
-    def get_signature_file(self):
+    def get_signature_file(self) -> str:
         return "_func001.dat"
 
-    def get_type(self):
+    def get_type(self) -> str:
         return "Waters MassLynx RAW directory archive"
 
 
@@ -3922,16 +3992,44 @@ class WiffTar(BafTar):
 
     file_ext = "wiff.tar"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if tarfile.is_tarfile(filename):
             with tarfile.open(filename) as rawtar:
                 return ".wiff" in [os.path.splitext(os.path.basename(f).lower())[1] for f in rawtar.getnames()]
         return False
 
-    def get_type(self):
+    def get_type(self) -> str:
         return "Sciex WIFF/SCAN archive"
 
 
+class Wiff2Tar(BafTar):
+    """
+    A tar'd up .wiff2/.scan pair containing Sciex WIFF format data
+
+    >>> from galaxy.datatypes.sniff import get_test_fname
+    >>> fname = get_test_fname('some.wiff2.tar')
+    >>> Wiff2Tar().sniff(fname)
+    True
+    >>> fname = get_test_fname('brukerbaf.d.tar')
+    >>> Wiff2Tar().sniff(fname)
+    False
+    >>> fname = get_test_fname('test.fast5.tar')
+    >>> Wiff2Tar().sniff(fname)
+    False
+    """
+
+    file_ext = "wiff2.tar"
+
+    def sniff(self, filename: str) -> bool:
+        if tarfile.is_tarfile(filename):
+            with tarfile.open(filename) as rawtar:
+                return ".wiff2" in [os.path.splitext(os.path.basename(f).lower())[1] for f in rawtar.getnames()]
+        return False
+
+    def get_type(self) -> str:
+        return "Sciex WIFF2/SCAN archive"
+
+
 @build_sniff_from_prefix
 class Pretext(Binary):
     """
@@ -3946,12 +4044,12 @@ class Pretext(Binary):
 
     file_ext = "pretext"
 
-    def sniff_prefix(self, sniff_prefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         # The first 4 bytes of any pretext file is 'pstm', and the rest of the
         # file contains binary data.
-        return sniff_prefix.startswith_bytes(b"pstm")
+        return file_prefix.startswith_bytes(b"pstm")
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary pretext file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -3959,7 +4057,7 @@ class Pretext(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -3985,7 +4083,7 @@ class JP2(Binary):
         super().__init__(**kwd)
         self._magic = binascii.unhexlify("0000000C6A5020200D0A870A")
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         # The first 12 bytes of any jp2 file are 0000000C6A5020200D0A870A
         try:
             header = open(filename, "rb").read(12)
@@ -3995,7 +4093,7 @@ class JP2(Binary):
         except Exception:
             return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary JPEG 2000 file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -4003,7 +4101,7 @@ class JP2(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -4032,7 +4130,7 @@ class Npz(CompressedArchive):
     def __init__(self, **kwd):
         super().__init__(**kwd)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         try:
             npz = np.load(filename)
             if isinstance(npz, np.lib.npyio.NpzFile):
@@ -4043,7 +4141,7 @@ class Npz(CompressedArchive):
             return False
         return False
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         try:
             with np.load(dataset.file_name) as npz:
                 dataset.metadata.nfiles = len(npz.files)
@@ -4051,7 +4149,7 @@ class Npz(CompressedArchive):
         except Exception as e:
             log.warning("%s, set_meta Exception: %s", self, e)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = f"Binary Numpy npz {dataset.metadata.nfiles} files ({nice_size(dataset.get_size())})"
             dataset.blurb = nice_size(dataset.get_size())
@@ -4059,7 +4157,7 @@ class Npz(CompressedArchive):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -4100,7 +4198,7 @@ class HexrdImagesNpz(Npz):
     def __init__(self, **kwd):
         super().__init__(**kwd)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
             try:
                 req_files = {"0_row", "0_col", "0_data", "shape", "nframes", "dtype"}
@@ -4111,8 +4209,8 @@ class HexrdImagesNpz(Npz):
                 return False
         return False
 
-    def set_meta(self, dataset, **kwd):
-        super().set_meta(dataset, **kwd)
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
         try:
             with np.load(dataset.file_name) as npz:
                 if "panel_id" in npz.files:
@@ -4124,7 +4222,7 @@ class HexrdImagesNpz(Npz):
         except Exception as e:
             log.warning("%s, set_meta Exception: %s", self, e)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             lines = [
                 f"Binary Hexrd Image npz {dataset.metadata.nfiles} files ({nice_size(dataset.get_size())})",
@@ -4136,7 +4234,7 @@ class HexrdImagesNpz(Npz):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -4166,7 +4264,7 @@ class HexrdEtaOmeNpz(Npz):
     def __init__(self, **kwd):
         super().__init__(**kwd)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if super().sniff(filename):
             try:
                 req_files = {"dataStore", "etas", "etaEdges", "iHKLList", "omegas", "omeEdges", "planeData_hkls"}
@@ -4177,8 +4275,8 @@ class HexrdEtaOmeNpz(Npz):
                 return False
         return False
 
-    def set_meta(self, dataset, **kwd):
-        super().set_meta(dataset, **kwd)
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
         try:
             with np.load(dataset.file_name) as npz:
                 dataset.metadata.HKLs = npz["iHKLList"].tolist()
@@ -4186,7 +4284,7 @@ class HexrdEtaOmeNpz(Npz):
         except Exception as e:
             log.warning("%s, set_meta Exception: %s", self, e)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             lines = [
                 f"Binary Hexrd Eta-Ome npz {dataset.metadata.nfiles} files ({nice_size(dataset.get_size())})",
@@ -4198,7 +4296,7 @@ class HexrdEtaOmeNpz(Npz):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
diff --git a/lib/galaxy/datatypes/blast.py b/lib/galaxy/datatypes/blast.py
index d55d6cfe67c..fb571a023bb 100644
--- a/lib/galaxy/datatypes/blast.py
+++ b/lib/galaxy/datatypes/blast.py
@@ -33,6 +33,13 @@ Covers the ``blastxml`` format and the BLAST databases.
 import logging
 import os
 from time import sleep
+from typing import (
+    Callable,
+    Dict,
+    List,
+    Optional,
+    TYPE_CHECKING,
+)
 
 from galaxy.datatypes.sniff import (
     build_sniff_from_prefix,
@@ -46,6 +53,12 @@ from .data import (
 )
 from .xml import GenericXml
 
+if TYPE_CHECKING:
+    from galaxy.model import (
+        DatasetInstance,
+        HistoryDatasetAssociation,
+    )
+
 log = logging.getLogger(__name__)
 
 
@@ -57,7 +70,7 @@ class BlastXml(GenericXml):
     edam_format = "format_3331"
     edam_data = "data_0857"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
@@ -66,7 +79,7 @@ class BlastXml(GenericXml):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """Determines whether the file is blastxml
 
         >>> from galaxy.datatypes.sniff import get_test_fname
@@ -96,7 +109,7 @@ class BlastXml(GenericXml):
         return True
 
     @staticmethod
-    def merge(split_files, output_file):
+    def merge(split_files: List[str], output_file: str) -> None:
         """Merging multiple XML files is non-trivial and must be done in subclasses."""
         if len(split_files) == 1:
             # For one file only, use base class method (move/copy)
@@ -182,7 +195,7 @@ class BlastXml(GenericXml):
 class _BlastDb(Data):
     """Base class for BLAST database datatype."""
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text."""
         if not dataset.dataset.purged:
             dataset.peek = "BLAST database (multiple files)"
@@ -191,14 +204,24 @@ class _BlastDb(Data):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Create HTML content, used for displaying peek."""
         try:
             return dataset.peek
         except Exception:
             return "BLAST database (multiple files)"
 
-    def display_data(self, trans, data, preview=False, filename=None, to_ext=None, size=None, offset=None, **kwd):
+    def display_data(
+        self,
+        trans,
+        dataset: "HistoryDatasetAssociation",
+        preview: bool = False,
+        filename: Optional[str] = None,
+        to_ext: Optional[str] = None,
+        offset: Optional[int] = None,
+        ck_size: Optional[int] = None,
+        **kwd,
+    ):
         """
         If preview is `True` allows us to format the data shown in the central pane via the "eye" icon.
         If preview is `False` triggers download.
@@ -206,7 +229,14 @@ class _BlastDb(Data):
         headers = kwd.get("headers", {})
         if not preview:
             return super().display_data(
-                trans, data=data, preview=preview, filename=filename, to_ext=to_ext, size=size, offset=offset, **kwd
+                trans,
+                dataset=dataset,
+                preview=preview,
+                filename=filename,
+                to_ext=to_ext,
+                offset=offset,
+                ck_size=ck_size,
+                **kwd,
             )
         if self.file_ext == "blastdbn":
             title = "This is a nucleotide BLAST database"
@@ -220,7 +250,7 @@ class _BlastDb(Data):
         msg = ""
         try:
             # Try to use any text recorded in the dummy index file:
-            with open(data.file_name, encoding="utf-8") as handle:
+            with open(dataset.file_name, encoding="utf-8") as handle:
                 msg = handle.read().strip()
         except Exception:
             pass
@@ -229,11 +259,13 @@ class _BlastDb(Data):
         # Galaxy assumes HTML for the display of composite datatypes,
         return smart_str(f"<html><head><title>{title}</title></head><body><pre>{msg}</pre></body></html>"), headers
 
-    def merge(split_files, output_file):
+    @staticmethod
+    def merge(split_files: List[str], output_file: str) -> None:
         """Merge BLAST databases (not implemented for now)."""
         raise NotImplementedError("Merging BLAST databases is non-trivial (do this via makeblastdb?)")
 
-    def split(cls, input_datasets, subdir_generator_function, split_params):
+    @classmethod
+    def split(cls, input_datasets: List, subdir_generator_function: Callable, split_params: Dict) -> None:
         """Split a BLAST database (not implemented for now)."""
         if split_params is None:
             return None
@@ -340,7 +372,7 @@ class LastDb(Data):
     file_ext = "lastdb"
     composite_type = "basic"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text."""
         if not dataset.dataset.purged:
             dataset.peek = "LAST database (multiple files)"
@@ -349,7 +381,7 @@ class LastDb(Data):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Create HTML content, used for displaying peek."""
         try:
             return dataset.peek
diff --git a/lib/galaxy/datatypes/constructive_solid_geometry.py b/lib/galaxy/datatypes/constructive_solid_geometry.py
index 63a63d9e4f1..528921df9b0 100644
--- a/lib/galaxy/datatypes/constructive_solid_geometry.py
+++ b/lib/galaxy/datatypes/constructive_solid_geometry.py
@@ -5,7 +5,12 @@ Constructive Solid Geometry file formats.
 """
 
 import abc
-from typing import List
+from typing import (
+    List,
+    Optional,
+    Tuple,
+    TYPE_CHECKING,
+)
 
 from galaxy import util
 from galaxy.datatypes import data
@@ -21,6 +26,11 @@ from galaxy.datatypes.sniff import (
 )
 from galaxy.datatypes.tabular import Tabular
 
+if TYPE_CHECKING:
+    from io import TextIOBase
+
+    from galaxy.model import DatasetInstance
+
 MAX_HEADER_LINES = 500
 MAX_LINE_LEN = 2000
 COLOR_OPTS = ["COLOR_SCALARS", "red", "green", "blue"]
@@ -54,7 +64,7 @@ class Ply:
     def __init__(self, **kwd):
         raise NotImplementedError
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         The structure of a typical PLY file:
         Header, Vertex List, Face List, (lists of other elements)
@@ -63,7 +73,7 @@ class Ply:
             return False
         return True
 
-    def _is_ply_header(self, fh, subtype):
+    def _is_ply_header(self, fh: "TextIOBase", subtype: str) -> bool:
         """
         The header is a series of carriage-return terminated lines of
         text that describe the remainder of the file.
@@ -92,7 +102,7 @@ class Ply:
                 break
         return False
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         if dataset.has_data():
             with open(dataset.file_name, errors="ignore") as fh:
                 for line in fh:
@@ -115,7 +125,7 @@ class Ply:
                             element_tuple = (items[1], int(items[2]))
                             dataset.metadata.other_elements.append(element_tuple)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             dataset.blurb = f"Faces: {str(dataset.metadata.face)}, Vertices: {str(dataset.metadata.vertex)}"
@@ -123,7 +133,7 @@ class Ply:
             dataset.peek = "File does not exist"
             dataset.blurb = "File purged from disc"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -226,7 +236,7 @@ class Vtk:
     def __init__(self, **kwd):
         raise NotImplementedError
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         VTK files can be either ASCII or binary, with two different
         styles of file formats: legacy or XML.  We'll assume if the
@@ -236,7 +246,7 @@ class Vtk:
             return True
         return False
 
-    def _is_vtk_header(self, fh, subtype):
+    def _is_vtk_header(self, fh: "TextIOBase", subtype: str) -> bool:
         """
         The Header section consists of at least 4, but possibly
         5 lines.  This is tricky because sometimes the 4th line
@@ -272,7 +282,7 @@ class Vtk:
             return check_data_kind(line)
         return False
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         if dataset.has_data():
             dataset.metadata.field_names = []
             dataset.metadata.field_components = {}
@@ -361,7 +371,7 @@ class Vtk:
             if len(field_components) > 0:
                 dataset.metadata.field_components = field_components
 
-    def set_initial_metadata(self, i, line, dataset):
+    def set_initial_metadata(self, i: int, line: str, dataset: "DatasetInstance") -> "DatasetInstance":
         if i == 0:
             # The first part of legacy VTK files is the file version and
             # identifier. This part contains the single line:
@@ -379,7 +389,9 @@ class Vtk:
             dataset.metadata.file_format = line
         return dataset
 
-    def set_structure_metadata(self, line, dataset, dataset_type):
+    def set_structure_metadata(
+        self, line: str, dataset: "DatasetInstance", dataset_type: Optional[str]
+    ) -> Tuple["DatasetInstance", Optional[str]]:
         """
         The fourth part of legacy VTK files is the dataset structure. The
         geometry part describes the geometry and topology of the dataset.
@@ -437,7 +449,7 @@ class Vtk:
                 dataset.metadata.cells = int(line.split()[1])
         return dataset, dataset_type
 
-    def get_blurb(self, dataset):
+    def get_blurb(self, dataset: "DatasetInstance") -> str:
         blurb = ""
         if dataset.metadata.vtk_version is not None:
             blurb += f"VTK Version {str(dataset.metadata.vtk_version)}"
@@ -447,7 +459,7 @@ class Vtk:
             blurb += str(dataset.metadata.dataset_type)
         return blurb or "VTK data"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             dataset.blurb = self.get_blurb(dataset)
@@ -455,7 +467,7 @@ class Vtk:
             dataset.peek = "File does not exist"
             dataset.blurb = "File purged from disc"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -526,7 +538,7 @@ class NeperTess(data.Text):
     def __init__(self, **kwd):
         data.Text.__init__(self, **kwd)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Neper tess format, starts with ``***tess``
 
@@ -540,7 +552,7 @@ class NeperTess(data.Text):
         """
         return file_prefix.text_io(errors="ignore").readline(10).startswith("***tess")
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         if dataset.has_data():
             with open(dataset.file_name, errors="ignore") as fh:
                 for i, line in enumerate(fh):
@@ -556,9 +568,9 @@ class NeperTess(data.Text):
                     if i == 6:
                         dataset.metadata.cells = int(line)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
-            dataset.peek = get_file_peek(dataset.file_name, LINE_COUNT=7)
+            dataset.peek = get_file_peek(dataset.file_name, line_count=7)
             dataset.blurb = f"format: {str(dataset.metadata.format)} dim: {str(dataset.metadata.dimension)} cells: {str(dataset.metadata.cells)}"
         else:
             dataset.peek = "File does not exist"
@@ -597,7 +609,7 @@ class NeperTesr(Binary):
     def __init__(self, **kwd):
         Binary.__init__(self, **kwd)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Neper tesr format, starts with ``***tesr``
 
@@ -611,7 +623,7 @@ class NeperTesr(Binary):
         """
         return file_prefix.text_io(errors="ignore").readline(10).startswith("***tesr")
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         if dataset.has_data():
             with open(dataset.file_name, errors="ignore") as fh:
                 field = ""
@@ -643,9 +655,9 @@ class NeperTesr(Binary):
                         dataset.metadata.cells = int(line)
                         break
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
-            dataset.peek = get_file_peek(dataset.file_name, LINE_COUNT=9)
+            dataset.peek = get_file_peek(dataset.file_name, line_count=9)
             dataset.blurb = f"format: {str(dataset.metadata.format)} dim: {str(dataset.metadata.dimension)} cells: {str(dataset.metadata.cells)}"
         else:
             dataset.peek = "File does not exist"
@@ -664,13 +676,13 @@ class NeperPoints(data.Text):
     def __init__(self, **kwd):
         data.Text.__init__(self, **kwd)
 
-    def set_meta(self, dataset, **kwd):
-        data.Text.set_meta(self, dataset, **kwd)
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
+        data.Text.set_meta(self, dataset, overwrite=overwrite, **kwd)
         if dataset.has_data():
             with open(dataset.file_name, errors="ignore") as fh:
                 dataset.metadata.dimension = self._get_dimension(fh)
 
-    def _get_dimension(self, fh, maxlines=100, sep=None):
+    def _get_dimension(self, fh: "TextIOBase", maxlines: int = 100, sep: Optional[str] = None) -> Optional[float]:
         dim = None
         try:
             for i, line in enumerate(fh):
@@ -689,7 +701,7 @@ class NeperPoints(data.Text):
             return None
         return dim
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         data.Text.set_peek(self, dataset)
         if not dataset.dataset.purged:
             dataset.blurb += f" dim: {str(dataset.metadata.dimension)}"
@@ -706,13 +718,13 @@ class NeperPointsTabular(NeperPoints, Tabular):
     def __init__(self, **kwd):
         Tabular.__init__(self, **kwd)
 
-    def set_meta(self, dataset, **kwd):
-        Tabular.set_meta(self, dataset, **kwd)
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
+        Tabular.set_meta(self, dataset, overwrite=overwrite, **kwd)
         if dataset.has_data():
             with open(dataset.file_name, errors="ignore") as fh:
                 dataset.metadata.dimension = self._get_dimension(fh)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         Tabular.set_peek(self, dataset)
         if not dataset.dataset.purged:
             dataset.blurb += f" dim: {str(dataset.metadata.dimension)}"
@@ -738,7 +750,7 @@ class GmshMsh(Binary):
     def __init__(self, **kwd):
         Binary.__init__(self, **kwd)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Gmsh msh format, starts with ``$MeshFormat``
 
@@ -752,7 +764,7 @@ class GmshMsh(Binary):
         """
         return file_prefix.text_io(errors="ignore").readline().startswith("$MeshFormat")
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         if dataset.has_data():
             with open(dataset.file_name, errors="ignore") as fh:
                 for i, line in enumerate(fh):
@@ -768,9 +780,9 @@ class GmshMsh(Binary):
                         if len(fields) > 1:
                             dataset.metadata.format = "ASCII" if fields[1] == "0" else "binary"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
-            dataset.peek = get_file_peek(dataset.file_name, LINE_COUNT=3)
+            dataset.peek = get_file_peek(dataset.file_name, line_count=3)
             dataset.blurb = f"Gmsh verion: {str(dataset.metadata.version)} {str(dataset.metadata.format)}"
         else:
             dataset.peek = "File does not exist"
diff --git a/lib/galaxy/datatypes/converters/cram_to_bam_converter.xml b/lib/galaxy/datatypes/converters/cram_to_bam_converter.xml
index ee464bb12b9..837bd2efb4b 100644
--- a/lib/galaxy/datatypes/converters/cram_to_bam_converter.xml
+++ b/lib/galaxy/datatypes/converters/cram_to_bam_converter.xml
@@ -16,7 +16,7 @@ python '$__tool_directory__/cram_to_bam.py' '$input' '$output'
             <param name="input" ftype="cram" value="2.cram"/>
             <output name="output" ftype="bam">
                 <assert_contents>
-                    <has_size value="57232"/>
+                    <has_size value="60331"/>
                 </assert_contents>
             </output>
         </test>
diff --git a/lib/galaxy/datatypes/coverage.py b/lib/galaxy/datatypes/coverage.py
index 1d489c1fc48..6ad3efe1541 100644
--- a/lib/galaxy/datatypes/coverage.py
+++ b/lib/galaxy/datatypes/coverage.py
@@ -4,7 +4,6 @@ Coverage datatypes
 """
 
 import logging
-import math
 
 from galaxy.datatypes import metadata
 from galaxy.datatypes.metadata import MetadataElement
@@ -29,12 +28,3 @@ class LastzCoverage(Tabular):
         no_value=0,
     )
     MetadataElement(name="columns", default=3, desc="Number of columns", readonly=True, visible=False)
-
-    def get_track_resolution(self, dataset, start, end):
-        range = end - start
-        # Determine appropriate resolution to plot ~1000 points
-        resolution = math.ceil(10 ** math.ceil(math.log10(range / 1000)))
-        # Restrict to valid range
-        resolution = min(resolution, 10000)
-        resolution = max(resolution, 1)
-        return resolution
diff --git a/lib/galaxy/datatypes/data.py b/lib/galaxy/datatypes/data.py
index 5ad6402ce31..d8ff7f93e53 100644
--- a/lib/galaxy/datatypes/data.py
+++ b/lib/galaxy/datatypes/data.py
@@ -7,7 +7,11 @@ import tempfile
 from inspect import isclass
 from typing import (
     Any,
+    Callable,
     Dict,
+    Generator,
+    IO,
+    Iterable,
     List,
     Optional,
     Tuple,
@@ -16,7 +20,10 @@ from typing import (
 )
 
 from markupsafe import escape
-from typing_extensions import Literal
+from typing_extensions import (
+    Literal,
+    Protocol,
+)
 
 from galaxy import util
 from galaxy.datatypes.metadata import (
@@ -36,6 +43,7 @@ from galaxy.util import (
     unicodify,
 )
 from galaxy.util.bunch import Bunch
+from galaxy.util.compression_utils import FileObjType
 from galaxy.util.markdown import (
     indicate_data_truncated,
     literal_via_fence,
@@ -48,7 +56,13 @@ from . import (
 )
 
 if TYPE_CHECKING:
-    from galaxy.model import DatasetInstance
+    from galaxy.datatypes.display_applications.application import DisplayApplication
+    from galaxy.datatypes.registry import Registry
+    from galaxy.model import (
+        DatasetInstance,
+        HistoryDatasetAssociation,
+        HistoryDatasetCollectionAssociation,
+    )
 
 XSS_VULNERABLE_MIME_TYPES = [
     "image/svg+xml",  # Unfiltered by Galaxy and may contain JS that would be executed by some browsers.
@@ -69,32 +83,37 @@ DEFAULT_MAX_PEEK_SIZE = 1000000  # 1 MB
 Headers = Dict[str, Any]
 
 
+class GeneratePrimaryFileDataset(Protocol):
+    extra_files_path: str
+    metadata: Any
+
+
 class DatatypeConverterNotFoundException(Exception):
     pass
 
 
 class DatatypeValidation:
-    def __init__(self, state, message):
+    def __init__(self, state: str, message: str) -> None:
         self.state = state
         self.message = message
 
     @staticmethod
-    def validated():
+    def validated() -> "DatatypeValidation":
         return DatatypeValidation("ok", "Dataset validated by datatype validator.")
 
     @staticmethod
-    def invalid(message):
+    def invalid(message: str) -> "DatatypeValidation":
         return DatatypeValidation("invalid", message)
 
     @staticmethod
-    def unvalidated():
+    def unvalidated() -> "DatatypeValidation":
         return DatatypeValidation("unknown", "Dataset validation unimplemented for this datatype.")
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"DatatypeValidation[state={self.state},message={self.message}]"
 
 
-def validate(dataset_instance):
+def validate(dataset_instance: "DatasetInstance") -> DatatypeValidation:
     try:
         datatype_validation = dataset_instance.datatype.validate(dataset_instance)
     except Exception as e:
@@ -102,7 +121,9 @@ def validate(dataset_instance):
     return datatype_validation
 
 
-def get_params_and_input_name(converter, deps, target_context=None):
+def get_params_and_input_name(
+    converter, deps: Optional[Dict], target_context: Optional[Dict] = None
+) -> Tuple[Dict, str]:
     # Generate parameter dictionary
     params = {}
     # determine input parameter name and add to params
@@ -200,7 +221,7 @@ class Data(metaclass=DataMeta):
         self.display_applications = {}
 
     @classmethod
-    def is_datatype_change_allowed(cls):
+    def is_datatype_change_allowed(cls) -> bool:
         """
         Returns the value of the `allow_datatype_change` class attribute if set
         in a subclass, or True iff the datatype is not composite.
@@ -209,14 +230,14 @@ class Data(metaclass=DataMeta):
             return cls.allow_datatype_change
         return cls.composite_type is None
 
-    def dataset_content_needs_grooming(self, file_name):
+    def dataset_content_needs_grooming(self, file_name: str) -> bool:
         """This function is called on an output dataset file after the content is initially generated."""
         return False
 
-    def groom_dataset_content(self, file_name):
+    def groom_dataset_content(self, file_name: str) -> None:
         """This function is called on an output dataset file if dataset_content_needs_grooming returns True."""
 
-    def init_meta(self, dataset, copy_from=None):
+    def init_meta(self, dataset: "DatasetInstance", copy_from: Optional["DatasetInstance"] = None) -> None:
         # Metadata should be left mostly uninitialized.  Dataset will
         # handle returning default values when metadata is not set.
         # copy_from allows metadata to be passed in that will be
@@ -226,11 +247,12 @@ class Data(metaclass=DataMeta):
         if copy_from:
             dataset.metadata = copy_from.metadata
 
-    def set_meta(self, dataset: Any, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", *, overwrite: bool = True, **kwd) -> None:
         """Unimplemented method, allows guessing of metadata from contents of file"""
-        return True
 
-    def missing_meta(self, dataset, check=None, skip=None):
+    def missing_meta(
+        self, dataset: "DatasetInstance", check: Optional[List] = None, skip: Optional[List] = None
+    ) -> bool:
         """
         Checks for empty metadata values.
         Returns False if no non-optional metadata is missing and the missing metadata key otherwise.
@@ -257,14 +279,14 @@ class Data(metaclass=DataMeta):
                 return key
         return False
 
-    def set_max_optional_metadata_filesize(self, max_value):
+    def set_max_optional_metadata_filesize(self, max_value: int) -> None:
         try:
             max_value = int(max_value)
         except (TypeError, ValueError):
             return
         self.__class__._max_optional_metadata_filesize = max_value
 
-    def get_max_optional_metadata_filesize(self):
+    def get_max_optional_metadata_filesize(self) -> int:
         rval = self.__class__._max_optional_metadata_filesize
         if rval is None:
             return -1
@@ -272,7 +294,7 @@ class Data(metaclass=DataMeta):
 
     max_optional_metadata_filesize = property(get_max_optional_metadata_filesize, set_max_optional_metadata_filesize)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """
         Set the peek and blurb text
         """
@@ -283,7 +305,7 @@ class Data(metaclass=DataMeta):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Create HTML table, used for displaying peek"""
         out = ['<table cellspacing="0" cellpadding="3">']
         try:
@@ -301,7 +323,9 @@ class Data(metaclass=DataMeta):
         except Exception as exc:
             return f"Can't create peek: {unicodify(exc)}"
 
-    def _archive_main_file(self, archive, display_name, data_filename):
+    def _archive_main_file(
+        self, archive: ZipstreamWrapper, display_name: str, data_filename: str
+    ) -> Tuple[bool, str, str]:
         """Called from _archive_composite_dataset to add central file to archive.
 
         Unless subclassed, this will add the main dataset file (argument data_filename)
@@ -321,7 +345,9 @@ class Data(metaclass=DataMeta):
             messagetype = "error"
         return error, msg, messagetype
 
-    def _archive_composite_dataset(self, trans, data, headers: Headers, do_action="zip"):
+    def _archive_composite_dataset(
+        self, trans, data: "DatasetInstance", headers: Headers, do_action: str = "zip"
+    ) -> Tuple[Union[ZipstreamWrapper, str], Headers]:
         # save a composite object into a compressed archive for downloading
         outfname = data.name[0:150]
         outfname = "".join(c in FILENAME_VALID_CHARS and c or "_" for c in outfname)
@@ -357,7 +383,7 @@ class Data(metaclass=DataMeta):
             return archive, headers
         return trans.show_error_message(msg), headers
 
-    def __archive_extra_files_path(self, extra_files_path):
+    def __archive_extra_files_path(self, extra_files_path: str) -> Generator[Tuple[str, str], None, None]:
         """Yield filepaths and relative filepaths for files in extra_files_path"""
         for root, _, files in os.walk(extra_files_path):
             for fname in files:
@@ -365,7 +391,9 @@ class Data(metaclass=DataMeta):
                 rpath = os.path.relpath(fpath, extra_files_path)
                 yield fpath, rpath
 
-    def _serve_raw(self, dataset, to_ext, headers: Headers, **kwd):
+    def _serve_raw(
+        self, dataset: "HistoryDatasetAssociation", to_ext: Optional[str], headers: Headers, **kwd
+    ) -> Tuple[IO, Headers]:
         headers["Content-Length"] = str(os.stat(dataset.file_name).st_size)
         headers[
             "content-type"
@@ -380,7 +408,7 @@ class Data(metaclass=DataMeta):
         headers["Content-Disposition"] = f'attachment; filename="{filename}"'
         return open(dataset.file_name, mode="rb"), headers
 
-    def to_archive(self, dataset, name=""):
+    def to_archive(self, dataset: "DatasetInstance", name: str = "") -> Iterable:
         """
         Collect archive paths and file handles that need to be exported when archiving `dataset`.
 
@@ -402,7 +430,15 @@ class Data(metaclass=DataMeta):
             file_paths.append(dataset.file_name)
         return zip(file_paths, rel_paths)
 
-    def display_data(self, trans, data, preview=False, filename=None, to_ext=None, **kwd):
+    def display_data(
+        self,
+        trans,
+        dataset: "HistoryDatasetAssociation",
+        preview: bool = False,
+        filename: Optional[str] = None,
+        to_ext: Optional[str] = None,
+        **kwd,
+    ):
         """
         Displays data in central pane if preview is `True`, else handles download.
 
@@ -416,13 +452,14 @@ class Data(metaclass=DataMeta):
         # Relocate all composite datatype display to a common location.
         composite_extensions = trans.app.datatypes_registry.get_composite_extensions()
         composite_extensions.append("html")  # for archiving composite datatypes
+        composite_extensions.append("data_manager_json")  # for downloading bundles if bundled.
         # Prevent IE8 from sniffing content type since we're explicit about it.  This prevents intentionally text/plain
         # content from being rendered in the browser
         headers["X-Content-Type-Options"] = "nosniff"
         if filename and filename != "index":
             # For files in extra_files_path
-            extra_dir = data.dataset.extra_files_path_name
-            file_path = trans.app.object_store.get_filename(data.dataset, extra_dir=extra_dir, alt_name=filename)
+            extra_dir = dataset.dataset.extra_files_path_name
+            file_path = trans.app.object_store.get_filename(dataset.dataset, extra_dir=extra_dir, alt_name=filename)
             if os.path.exists(file_path):
                 if os.path.isdir(file_path):
                     with tempfile.NamedTemporaryFile(
@@ -446,37 +483,37 @@ class Data(metaclass=DataMeta):
                             # levels of the primary dataset.  Something like this is
                             # close, but not quite correct:
                             # href = url_for(controller='dataset', action='display',
-                            # dataset_id=trans.security.encode_id(data.dataset.id),
+                            # dataset_id=trans.security.encode_id(dataset.dataset.id),
                             # preview=preview, filename=fname, to_ext=to_ext)
                             tmp_fh.write(f'<tr bgcolor="{bgcolor}"><td>{escape(fname)}</td></tr>\n')
                         tmp_fh.write("</table></body></html>\n")
-                    return self._yield_user_file_content(trans, data, tmp_file_name, headers), headers
+                    return self._yield_user_file_content(trans, dataset, tmp_file_name, headers), headers
                 mime = mimetypes.guess_type(file_path)[0]
                 if not mime:
                     try:
                         mime = trans.app.datatypes_registry.get_mimetype_by_extension(file_path.split(".")[-1])
                     except Exception:
                         mime = "text/plain"
-                self._clean_and_set_mime_type(trans, mime, headers)
-                return self._yield_user_file_content(trans, data, file_path, headers), headers
+                self._clean_and_set_mime_type(trans, mime, headers)  # type: ignore[arg-type]
+                return self._yield_user_file_content(trans, dataset, file_path, headers), headers
             else:
                 raise ObjectNotFound(f"Could not find '{filename}' on the extra files path {file_path}.")
-        self._clean_and_set_mime_type(trans, data.get_mime(), headers)
+        self._clean_and_set_mime_type(trans, dataset.get_mime(), headers)
 
-        trans.log_event(f"Display dataset id: {str(data.id)}")
+        trans.log_event(f"Display dataset id: {str(dataset.id)}")
         from galaxy.datatypes import (  # DBTODO REMOVE THIS AT REFACTOR
             binary,
             images,
             text,
         )
 
-        if to_ext or isinstance(data.datatype, binary.Binary):  # Saving the file, or binary file
-            if data.extension in composite_extensions:
-                return self._archive_composite_dataset(trans, data, headers, do_action=kwd.get("do_action", "zip"))
+        if to_ext or isinstance(dataset.datatype, binary.Binary):  # Saving the file, or binary file
+            if dataset.extension in composite_extensions:
+                return self._archive_composite_dataset(trans, dataset, headers, do_action=kwd.get("do_action", "zip"))
             else:
-                headers["Content-Length"] = str(os.stat(data.file_name).st_size)
+                headers["Content-Length"] = str(os.stat(dataset.file_name).st_size)
                 filename = self._download_filename(
-                    data,
+                    dataset,
                     to_ext,
                     hdca=kwd.get("hdca"),
                     element_identifier=kwd.get("element_identifier"),
@@ -486,25 +523,31 @@ class Data(metaclass=DataMeta):
                     "content-type"
                 ] = "application/octet-stream"  # force octet-stream so Safari doesn't append mime extensions to filename
                 headers["Content-Disposition"] = f'attachment; filename="{filename}"'
-                return open(data.file_name, "rb"), headers
-        if not os.path.exists(data.file_name):
-            raise ObjectNotFound(f"File Not Found ({data.file_name}).")
+                return open(dataset.file_name, "rb"), headers
+        if not os.path.exists(dataset.file_name):
+            raise ObjectNotFound(f"File Not Found ({dataset.file_name}).")
         max_peek_size = DEFAULT_MAX_PEEK_SIZE  # 1 MB
-        if isinstance(data.datatype, text.Html):
+        if isinstance(dataset.datatype, text.Html):
             max_peek_size = 10000000  # 10 MB for html
         preview = util.string_as_bool(preview)
-        if not preview or isinstance(data.datatype, images.Image) or os.stat(data.file_name).st_size < max_peek_size:
-            return self._yield_user_file_content(trans, data, data.file_name, headers), headers
+        if (
+            not preview
+            or isinstance(dataset.datatype, images.Image)
+            or os.stat(dataset.file_name).st_size < max_peek_size
+        ):
+            return self._yield_user_file_content(trans, dataset, dataset.file_name, headers), headers
         else:
             headers["content-type"] = "text/html"
             return (
                 trans.fill_template_mako(
-                    "/dataset/large_file.mako", truncated_data=open(data.file_name, "rb").read(max_peek_size), data=data
+                    "/dataset/large_file.mako",
+                    truncated_data=open(dataset.file_name, "rb").read(max_peek_size),
+                    dataset=dataset,
                 ),
                 headers,
             )
 
-    def display_as_markdown(self, dataset_instance: "DatasetInstance"):
+    def display_as_markdown(self, dataset_instance: "DatasetInstance") -> str:
         """Prepare for embedding dataset into a basic Markdown document.
 
         This is a somewhat experimental interface and should not be implemented
@@ -532,7 +575,7 @@ class Data(metaclass=DataMeta):
                 result += indicate_data_truncated()
         return result
 
-    def _yield_user_file_content(self, trans, from_dataset, filename, headers: Headers):
+    def _yield_user_file_content(self, trans, from_dataset: "DatasetInstance", filename: str, headers: Headers) -> IO:
         """This method is responsible for sanitizing the HTML if needed."""
         if trans.app.config.sanitize_all_html and headers.get("content-type", None) == "text/html":
             # Sanitize anytime we respond with plain text/html content.
@@ -551,7 +594,14 @@ class Data(metaclass=DataMeta):
 
         return open(filename, mode="rb")
 
-    def _download_filename(self, dataset, to_ext, hdca=None, element_identifier=None, filename_pattern=None):
+    def _download_filename(
+        self,
+        dataset: "HistoryDatasetAssociation",
+        to_ext: Optional[str] = None,
+        hdca: Optional["HistoryDatasetCollectionAssociation"] = None,
+        element_identifier: Optional[str] = None,
+        filename_pattern: Optional[str] = None,
+    ) -> str:
         def escape(raw_identifier):
             return "".join(c in FILENAME_VALID_CHARS and c or "_" for c in raw_identifier)[0:150]
 
@@ -580,14 +630,14 @@ class Data(metaclass=DataMeta):
 
         return string.Template(filename_pattern).substitute(**template_values)
 
-    def display_name(self, dataset):
+    def display_name(self, dataset: "DatasetInstance") -> str:
         """Returns formatted html of dataset name"""
         try:
             return escape(unicodify(dataset.name, "utf-8"))
         except Exception:
             return "name unavailable"
 
-    def display_info(self, dataset):
+    def display_info(self, dataset: "DatasetInstance") -> str:
         """Returns formatted html of dataset info"""
         try:
             # Change new line chars to html
@@ -605,15 +655,11 @@ class Data(metaclass=DataMeta):
         except Exception:
             return "info unavailable"
 
-    def repair_methods(self, dataset):
-        """Unimplemented method, returns dict with method/option for repairing errors"""
-        return None
-
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Returns the mime type of the datatype"""
         return "application/octet-stream"
 
-    def add_display_app(self, app_id, label, file_function, links_function):
+    def add_display_app(self, app_id: str, label: str, file_function: str, links_function: str) -> None:
         """
         Adds a display app to the datatype.
         app_id is a unique id
@@ -628,7 +674,7 @@ class Data(metaclass=DataMeta):
             "links_function": links_function,
         }
 
-    def remove_display_app(self, app_id):
+    def remove_display_app(self, app_id: str) -> None:
         """Removes a display app from the datatype"""
         self.supported_display_apps = self.supported_display_apps.copy()
         try:
@@ -640,18 +686,18 @@ class Data(metaclass=DataMeta):
                 self.__class__.__name__,
             )
 
-    def clear_display_apps(self):
+    def clear_display_apps(self) -> None:
         self.supported_display_apps = {}
 
-    def add_display_application(self, display_application):
+    def add_display_application(self, display_application: "DisplayApplication") -> None:
         """New style display applications"""
         assert display_application.id not in self.display_applications, "Attempted to add a display application twice"
         self.display_applications[display_application.id] = display_application
 
-    def get_display_application(self, key, default=None):
+    def get_display_application(self, key: str, default: Optional["DisplayApplication"] = None) -> "DisplayApplication":
         return self.display_applications.get(key, default)
 
-    def get_display_applications_by_dataset(self, dataset, trans):
+    def get_display_applications_by_dataset(self, dataset: "DatasetInstance", trans) -> Dict[str, "DisplayApplication"]:
         rval = {}
         for key, value in self.display_applications.items():
             value = value.filter_by_dataset(dataset, trans)
@@ -659,18 +705,18 @@ class Data(metaclass=DataMeta):
                 rval[key] = value
         return rval
 
-    def get_display_types(self):
+    def get_display_types(self) -> List[str]:
         """Returns display types available"""
         return list(self.supported_display_apps.keys())
 
-    def get_display_label(self, type):
+    def get_display_label(self, type: str) -> str:
         """Returns primary label for display app"""
         try:
             return self.supported_display_apps[type]["label"]
         except Exception:
             return "unknown"
 
-    def as_display_type(self, dataset, type, **kwd):
+    def as_display_type(self, dataset: "DatasetInstance", type: str, **kwd) -> Union[FileObjType, str]:
         """Returns modified file contents for a particular display type"""
         try:
             if type in self.get_display_types():
@@ -684,7 +730,9 @@ class Data(metaclass=DataMeta):
             )
         return f"This display type ({type}) is not implemented for this datatype ({dataset.ext})."
 
-    def get_display_links(self, dataset, type, app, base_url, target_frame="_blank", **kwd):
+    def get_display_links(
+        self, dataset: "DatasetInstance", type: str, app, base_url: str, target_frame: str = "_blank", **kwd
+    ):
         """
         Returns a list of tuples of (name, link) for a particular display type.  No check on
         'access' permissions is done here - if you can view the dataset, you can also save it
@@ -705,7 +753,9 @@ class Data(metaclass=DataMeta):
             )
         return target_frame, []
 
-    def get_converter_types(self, original_dataset, datatypes_registry):
+    def get_converter_types(
+        self, original_dataset: "DatasetInstance", datatypes_registry: "Registry"
+    ) -> Dict[str, Dict]:
         """Returns available converters by type for this dataset"""
         return datatypes_registry.get_converters_by_datatype(original_dataset.ext)
 
@@ -720,12 +770,12 @@ class Data(metaclass=DataMeta):
     def convert_dataset(
         self,
         trans,
-        original_dataset,
-        target_type,
-        return_output=False,
-        visible=True,
-        deps=None,
-        target_context=None,
+        original_dataset: "HistoryDatasetAssociation",
+        target_type: str,
+        return_output: bool = False,
+        visible: bool = True,
+        deps: Optional[Dict] = None,
+        target_context: Optional[Dict] = None,
         history=None,
     ):
         """This function adds a job to the queue to convert a dataset to another type. Returns a message about success/failure."""
@@ -756,26 +806,26 @@ class Data(metaclass=DataMeta):
     # We need to clear associated files before we set metadata
     # so that as soon as metadata starts to be set, e.g. implicitly converted datasets are deleted and no longer available 'while' metadata is being set, not just after
     # We'll also clear after setting metadata, for backwards compatibility
-    def after_setting_metadata(self, dataset):
+    def after_setting_metadata(self, dataset: "DatasetInstance") -> None:
         """This function is called on the dataset after metadata is set."""
         dataset.clear_associated_files(metadata_safe=True)
 
-    def before_setting_metadata(self, dataset):
+    def before_setting_metadata(self, dataset: "DatasetInstance") -> None:
         """This function is called on the dataset before metadata is set."""
         dataset.clear_associated_files(metadata_safe=True)
 
     def __new_composite_file(
         self,
-        name,
-        optional=False,
-        mimetype=None,
-        description=None,
-        substitute_name_with_metadata=None,
-        is_binary=False,
-        to_posix_lines=True,
-        space_to_tab=False,
+        name: str,
+        optional: bool = False,
+        mimetype: Optional[str] = None,
+        description: Optional[str] = None,
+        substitute_name_with_metadata: Optional[str] = None,
+        is_binary: bool = False,
+        to_posix_lines: bool = True,
+        space_to_tab: bool = False,
         **kwds,
-    ):
+    ) -> Bunch:
         kwds["name"] = name
         kwds["optional"] = optional
         kwds["mimetype"] = mimetype
@@ -788,7 +838,7 @@ class Data(metaclass=DataMeta):
         composite_file = Bunch(**kwds)
         return composite_file
 
-    def add_composite_file(self, name, **kwds):
+    def add_composite_file(self, name: str, **kwds) -> None:
         # self.composite_files = self.composite_files.copy()
         self.composite_files[name] = self.__new_composite_file(name, **kwds)
 
@@ -801,7 +851,7 @@ class Data(metaclass=DataMeta):
             files[key] = value
         return files
 
-    def get_writable_files_for_dataset(self, dataset):
+    def get_writable_files_for_dataset(self, dataset: "DatasetInstance") -> Dict:
         files = {}
         if self.composite_type != "auto_primary_file":
             files[self.primary_file_name] = self.__new_composite_file(self.primary_file_name)
@@ -824,7 +874,7 @@ class Data(metaclass=DataMeta):
             files[substitute_composite_key(key, value)] = value
         return files
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         raise Exception("generate_primary_file is not implemented for this datatype.")
 
     @property
@@ -840,7 +890,7 @@ class Data(metaclass=DataMeta):
         return isinstance(self, datatype_classes)
 
     @staticmethod
-    def merge(split_files, output_file):
+    def merge(split_files: List[str], output_file: str) -> None:
         """
         Merge files with copy.copyfileobj() will not hit the
         max argument limitation of cat. gz and bz2 files are also working.
@@ -854,23 +904,14 @@ class Data(metaclass=DataMeta):
                 for fsrc in split_files:
                     shutil.copyfileobj(open(fsrc, "rb"), fdst)
 
-    def get_visualizations(self, dataset):
-        """
-        Returns a list of visualizations for datatype.
-        """
-
-        if self.track_type:
-            return ["trackster", "circster"]
-        return []
-
     # ------------- Dataproviders
-    def has_dataprovider(self, data_format):
+    def has_dataprovider(self, data_format: str) -> bool:
         """
         Returns True if `data_format` is available in `dataproviders`.
         """
         return data_format in self.dataproviders
 
-    def dataprovider(self, dataset, data_format, **settings):
+    def dataprovider(self, dataset: "DatasetInstance", data_format: str, **settings):
         """
         Base dataprovider factory for all datatypes that returns the proper provider
         for the given `data_format` or raises a `NoProviderAvailable`.
@@ -879,34 +920,36 @@ class Data(metaclass=DataMeta):
             return self.dataproviders[data_format](self, dataset, **settings)
         raise p_dataproviders.exceptions.NoProviderAvailable(self, data_format)
 
-    def validate(self, dataset, **kwd):
+    def validate(self, dataset: "DatasetInstance", **kwd) -> DatatypeValidation:
         return DatatypeValidation.unvalidated()
 
     @p_dataproviders.decorators.dataprovider_factory("base")
-    def base_dataprovider(self, dataset, **settings):
+    def base_dataprovider(self, dataset: "DatasetInstance", **settings) -> p_dataproviders.base.DataProvider:
         dataset_source = p_dataproviders.dataset.DatasetDataProvider(dataset)
         return p_dataproviders.base.DataProvider(dataset_source, **settings)
 
     @p_dataproviders.decorators.dataprovider_factory("chunk", p_dataproviders.chunk.ChunkDataProvider.settings)
-    def chunk_dataprovider(self, dataset, **settings):
+    def chunk_dataprovider(self, dataset: "DatasetInstance", **settings) -> p_dataproviders.chunk.ChunkDataProvider:
         dataset_source = p_dataproviders.dataset.DatasetDataProvider(dataset)
         return p_dataproviders.chunk.ChunkDataProvider(dataset_source, **settings)
 
     @p_dataproviders.decorators.dataprovider_factory("chunk64", p_dataproviders.chunk.Base64ChunkDataProvider.settings)
-    def chunk64_dataprovider(self, dataset, **settings):
+    def chunk64_dataprovider(
+        self, dataset: "DatasetInstance", **settings
+    ) -> p_dataproviders.chunk.Base64ChunkDataProvider:
         dataset_source = p_dataproviders.dataset.DatasetDataProvider(dataset)
         return p_dataproviders.chunk.Base64ChunkDataProvider(dataset_source, **settings)
 
-    def _clean_and_set_mime_type(self, trans, mime, headers: Headers):
+    def _clean_and_set_mime_type(self, trans, mime: str, headers: Headers) -> None:
         if mime.lower() in XSS_VULNERABLE_MIME_TYPES:
             if not getattr(trans.app.config, "serve_xss_vulnerable_mimetypes", True):
                 mime = DEFAULT_MIME_TYPE
         headers["content-type"] = mime
 
-    def handle_dataset_as_image(self, hda) -> str:
+    def handle_dataset_as_image(self, hda: "DatasetInstance") -> str:
         raise Exception("Unimplemented Method")
 
-    def __getstate__(self):
+    def __getstate__(self) -> Dict[str, Any]:
         state = self.__dict__.copy()
         state.pop("display_applications", None)
         return state
@@ -931,17 +974,17 @@ class Text(Data):
         no_value=0,
     )
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Returns the mime type of the datatype"""
         return "text/plain"
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", *, overwrite: bool = True, **kwd) -> None:
         """
         Set the number of lines of data in dataset.
         """
         dataset.metadata.data_lines = self.count_data_lines(dataset)
 
-    def estimate_file_lines(self, dataset):
+    def estimate_file_lines(self, dataset: "DatasetInstance") -> Optional[int]:
         """
         Perform a rough estimate by extrapolating number of lines from a small read.
         """
@@ -955,7 +998,7 @@ class Text(Data):
             log.error(f"Unable to estimate lines in file {dataset.file_name}")
             return None
 
-    def count_data_lines(self, dataset):
+    def count_data_lines(self, dataset: "DatasetInstance") -> Optional[int]:
         """
         Count the number of lines of data in dataset,
         skipping all blank lines and comments.
@@ -976,13 +1019,18 @@ class Text(Data):
                 return None
         return data_lines
 
-    def set_peek(self, dataset, line_count=None, WIDTH=256, skipchars=None, line_wrap=True, **kwd):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """
         Set the peek.  This method is used by various subclasses of Text.
         """
+        line_count = kwd.get("line_count")
+        width = kwd.get("width", 256)
+        skipchars = kwd.get("skipchars")
+        line_wrap = kwd.get("line_wrap", True)
+
         if not dataset.dataset.purged:
             # The file must exist on disk for the get_file_peek() method
-            dataset.peek = get_file_peek(dataset.file_name, WIDTH=WIDTH, skipchars=skipchars, line_wrap=line_wrap)
+            dataset.peek = get_file_peek(dataset.file_name, width=width, skipchars=skipchars, line_wrap=line_wrap)
             if line_count is None:
                 # See if line_count is stored in the metadata
                 if dataset.metadata.data_lines:
@@ -1012,7 +1060,7 @@ class Text(Data):
             dataset.blurb = "file purged from disk"
 
     @classmethod
-    def split(cls, input_datasets, subdir_generator_function, split_params):
+    def split(cls, input_datasets: List, subdir_generator_function: Callable, split_params: Dict) -> None:
         """
         Split the input files by line.
         """
@@ -1084,7 +1132,9 @@ class Text(Data):
 
     # ------------- Dataproviders
     @p_dataproviders.decorators.dataprovider_factory("line", p_dataproviders.line.FilteredLineDataProvider.settings)
-    def line_dataprovider(self, dataset, **settings):
+    def line_dataprovider(
+        self, dataset: "DatasetInstance", **settings
+    ) -> p_dataproviders.line.FilteredLineDataProvider:
         """
         Returns an iterator over the dataset's lines (that have been stripped)
         optionally excluding blank lines and lines that start with a comment character.
@@ -1093,7 +1143,9 @@ class Text(Data):
         return p_dataproviders.line.FilteredLineDataProvider(dataset_source, **settings)
 
     @p_dataproviders.decorators.dataprovider_factory("regex-line", p_dataproviders.line.RegexLineDataProvider.settings)
-    def regex_line_dataprovider(self, dataset, **settings):
+    def regex_line_dataprovider(
+        self, dataset: "DatasetInstance", **settings
+    ) -> p_dataproviders.line.RegexLineDataProvider:
         """
         Returns an iterator over the dataset's lines
         optionally including/excluding lines that match one or more regex filters.
@@ -1128,16 +1180,10 @@ class Newick(Text):
     edam_format = "format_1910"
     file_ext = "newick"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """Returning false as the newick format is too general and cannot be sniffed."""
         return False
 
-    def get_visualizations(self, dataset):
-        """
-        Returns a list of visualizations for datatype.
-        """
-        return ["phyloviz"]
-
 
 @build_sniff_from_prefix
 class Nexus(Text):
@@ -1147,16 +1193,10 @@ class Nexus(Text):
     edam_format = "format_1912"
     file_ext = "nex"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """All Nexus Files Simply puts a '#NEXUS' in its first line"""
         return file_prefix.string_io().read(6).upper() == "#NEXUS"
 
-    def get_visualizations(self, dataset):
-        """
-        Returns a list of visualizations for datatype.
-        """
-        return ["phyloviz"]
-
 
 # ------------- Utility methods --------------
 
@@ -1173,9 +1213,9 @@ def get_test_fname(fname):
     return full_path
 
 
-def get_file_peek(file_name, WIDTH=256, LINE_COUNT=5, skipchars=None, line_wrap=True):
+def get_file_peek(file_name, width=256, line_count=5, skipchars=None, line_wrap=True):
     """
-    Returns the first LINE_COUNT lines wrapped to WIDTH.
+    Returns the first line_count lines wrapped to width.
 
     >>> def assert_peek_is(file_name, expected, *args, **kwd):
     ...     path = get_test_fname(file_name)
@@ -1183,14 +1223,14 @@ def get_file_peek(file_name, WIDTH=256, LINE_COUNT=5, skipchars=None, line_wrap=
     ...     assert peek == expected, "%s != %s" % (peek, expected)
     >>> assert_peek_is('0_nonewline', u'0')
     >>> assert_peek_is('0.txt', u'0\\n')
-    >>> assert_peek_is('4.bed', u'chr22\\t30128507\\t31828507\\tuc003bnx.1_cds_2_0_chr22_29227_f\\t0\\t+\\n', LINE_COUNT=1)
-    >>> assert_peek_is('1.bed', u'chr1\\t147962192\\t147962580\\tCCDS989.1_cds_0_0_chr1_147962193_r\\t0\\t-\\nchr1\\t147984545\\t147984630\\tCCDS990.1_cds_0_0_chr1_147984546_f\\t0\\t+\\n', LINE_COUNT=2)
+    >>> assert_peek_is('4.bed', u'chr22\\t30128507\\t31828507\\tuc003bnx.1_cds_2_0_chr22_29227_f\\t0\\t+\\n', line_count=1)
+    >>> assert_peek_is('1.bed', u'chr1\\t147962192\\t147962580\\tCCDS989.1_cds_0_0_chr1_147962193_r\\t0\\t-\\nchr1\\t147984545\\t147984630\\tCCDS990.1_cds_0_0_chr1_147984546_f\\t0\\t+\\n', line_count=2)
     """
     # Set size for file.readline() to a negative number to force it to
     # read until either a newline or EOF.  Needed for datasets with very
     # long lines.
-    if WIDTH == "unlimited":
-        WIDTH = -1
+    if width == "unlimited":
+        width = -1
     if skipchars is None:
         skipchars = []
     lines = []
@@ -1198,9 +1238,9 @@ def get_file_peek(file_name, WIDTH=256, LINE_COUNT=5, skipchars=None, line_wrap=
 
     last_line_break = False
     with compression_utils.get_fileobj(file_name) as temp:
-        while count < LINE_COUNT:
+        while count < line_count:
             try:
-                line = temp.readline(WIDTH)
+                line = temp.readline(width)
             except UnicodeDecodeError:
                 return "binary file"
             if line == "":
diff --git a/lib/galaxy/datatypes/flow.py b/lib/galaxy/datatypes/flow.py
index 34f6de4c90b..e520be5a1ea 100644
--- a/lib/galaxy/datatypes/flow.py
+++ b/lib/galaxy/datatypes/flow.py
@@ -3,6 +3,7 @@ Flow analysis datatypes.
 """
 
 import logging
+from typing import TYPE_CHECKING
 
 from galaxy.datatypes.binary import Binary
 from galaxy.datatypes.sniff import (
@@ -11,6 +12,9 @@ from galaxy.datatypes.sniff import (
 )
 from . import data
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 
@@ -20,7 +24,7 @@ class FCS(Binary):
 
     file_ext = "fcs"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary FCS file"
             dataset.blurb = data.nice_size(dataset.get_size())
@@ -28,13 +32,13 @@ class FCS(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
             return "Binary FCS file"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Checking if the file is in FCS format. Should read FCS2.0, FCS3.0
         and FCS3.1
diff --git a/lib/galaxy/datatypes/genetics.py b/lib/galaxy/datatypes/genetics.py
index 94df9610963..1ebb8398cb6 100644
--- a/lib/galaxy/datatypes/genetics.py
+++ b/lib/galaxy/datatypes/genetics.py
@@ -15,6 +15,14 @@ import logging
 import os
 import re
 import sys
+from typing import (
+    Dict,
+    IO,
+    List,
+    Optional,
+    TYPE_CHECKING,
+    Union,
+)
 from urllib.parse import quote_plus
 
 from markupsafe import escape
@@ -22,6 +30,7 @@ from markupsafe import escape
 from galaxy.datatypes import metadata
 from galaxy.datatypes.data import (
     DatatypeValidation,
+    GeneratePrimaryFileDataset,
     Text,
 )
 from galaxy.datatypes.metadata import MetadataElement
@@ -35,6 +44,10 @@ from galaxy.util import (
     nice_size,
     unicodify,
 )
+from galaxy.util.compression_utils import FileObjType
+
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
 
 gal_Log = logging.getLogger(__name__)
 verbose = False
@@ -62,23 +75,22 @@ class GenomeGraphs(Tabular):
         super().__init__(**kwd)
         self.add_display_app("ucsc", "Genome Graph", "as_ucsc_display_file", "ucsc_links")
 
-    def set_meta(self, dataset, **kwd):
-        super().set_meta(dataset, **kwd)
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
         dataset.metadata.markerCol = 1
         header = open(dataset.file_name).readlines()[0].strip().split("\t")
         dataset.metadata.columns = len(header)
         t = ["numeric" for x in header]
         t[0] = "string"
         dataset.metadata.column_types = t
-        return True
 
-    def as_ucsc_display_file(self, dataset, **kwd):
+    def as_ucsc_display_file(self, dataset: "DatasetInstance", **kwd) -> Union[FileObjType, str]:
         """
         Returns file
         """
         return open(dataset.file_name, "rb")
 
-    def ucsc_links(self, dataset, type, app, base_url):
+    def ucsc_links(self, dataset: "DatasetInstance", type: str, app, base_url: str) -> List:
         """
         from the ever-helpful angie hinrichs angie@soe.ucsc.edu
         a genome graphs call looks like this
@@ -130,17 +142,16 @@ class GenomeGraphs(Tabular):
                     ret_val.append((site_name, link))
         return ret_val
 
-    def make_html_table(self, dataset):
+    def make_html_table(self, dataset: "DatasetInstance", **kwargs) -> str:
         """
         Create HTML table, used for displaying peek
         """
-        out = ['<table cellspacing="0" cellpadding="3">']
         try:
+            out = ['<table cellspacing="0" cellpadding="3">']
             with open(dataset.file_name) as f:
                 d = f.readlines()[:5]
             if len(d) == 0:
-                out = f"Cannot find anything to parse in {dataset.name}"
-                return out
+                return f"Cannot find anything to parse in {dataset.name}"
             hasheader = 0
             try:
                 [f"{x:f}" for x in d[0][1:]]  # first is name - see if starts all numerics
@@ -158,12 +169,11 @@ class GenomeGraphs(Tabular):
                 out.append("".join(f"<td>{x}</td>" for x in row.split()))
                 out.append("</tr>")
             out.append("</table>")
-            out = "".join(out)
+            return "".join(out)
         except Exception as exc:
-            out = f"Can't create peek {exc}"
-        return out
+            return f"Can't create peek {exc}"
 
-    def validate(self, dataset, **kwd):
+    def validate(self, dataset: "DatasetInstance", **kwd) -> DatatypeValidation:
         """
         Validate a gg file - all numeric after header row
         """
@@ -172,10 +182,10 @@ class GenomeGraphs(Tabular):
             for row in infile:
                 ll = row.strip().split("\t")[1:]  # first is alpha feature identifier
                 for x in ll:
-                    x = float(x)
+                    float(x)
         return DatatypeValidation.validated()
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in gg format
 
@@ -207,7 +217,7 @@ class GenomeGraphs(Tabular):
                 return False
         return True
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Returns the mime type of the datatype"""
         return "application/vnd.ms-excel"
 
@@ -227,11 +237,11 @@ class rgTabList(Tabular):
         super().__init__(**kwd)
         self.column_names = []
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Returns formated html of peek"""
         return self.make_html_table(dataset, column_names=self.column_names)
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Returns the mime type of the datatype"""
         return "text/html"
 
@@ -292,7 +302,7 @@ class Rgenetics(Html):
     composite_type = "auto_primary_file"
     file_ext = "rgenetics"
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         rval = ["<html><head><title>Rgenetics Galaxy Composite Dataset </title></head><p/>"]
         rval.append("<div>This composite dataset is composed of the following files:<p/><ul>")
         for composite_name, composite_file in self.get_composite_files(dataset=dataset).items():
@@ -309,7 +319,7 @@ class Rgenetics(Html):
         rval.append("</ul></div></html>")
         return "\n".join(rval)
 
-    def regenerate_primary_file(self, dataset):
+    def regenerate_primary_file(self, dataset: "DatasetInstance") -> None:
         """
         cannot do this until we are setting metadata
         """
@@ -327,42 +337,41 @@ class Rgenetics(Html):
             f.write("\n".join(rval))
             f.write("\n")
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Returns the mime type of the datatype"""
         return "text/html"
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         for lped/pbed eg
 
         """
-        super().set_meta(dataset, **kwd)
-        if not kwd.get("overwrite"):
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
+        if not overwrite:
             if verbose:
                 gal_Log.debug("@@@ rgenetics set_meta called with overwrite = False")
-            return True
+            return
         try:
             efp = dataset.extra_files_path
         except Exception:
             if verbose:
                 gal_Log.debug(f"@@@rgenetics set_meta failed {sys.exc_info()[0]} - dataset {dataset.name} has no efp ?")
-            return False
+            return
         try:
             flist = os.listdir(efp)
         except Exception:
             if verbose:
                 gal_Log.debug(f"@@@rgenetics set_meta failed {sys.exc_info()[0]} - dataset {dataset.name} has no efp ?")
-            return False
+            return
         if len(flist) == 0:
             if verbose:
                 gal_Log.debug(f"@@@rgenetics set_meta failed - {dataset.name} efp {efp} is empty?")
-            return False
+            return
         self.regenerate_primary_file(dataset)
         if not dataset.info:
             dataset.info = "Galaxy genotype datatype object"
         if not dataset.blurb:
             dataset.blurb = "Composite file - Rgenetics Galaxy toolkit"
-        return True
 
 
 class SNPMatrix(Rgenetics):
@@ -372,7 +381,7 @@ class SNPMatrix(Rgenetics):
 
     file_ext = "snpmatrix"
 
-    def set_peek(self, dataset, **kwd):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Binary RGenetics file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -380,7 +389,7 @@ class SNPMatrix(Rgenetics):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """need to check the file header hex code"""
         with open(filename, "b") as infile:
             head = infile.read(16)
@@ -568,8 +577,8 @@ class IdeasPre(Html):
         self.add_composite_file("IDEAS_input_config.txt", description="IDEAS input config", is_binary=False)
         self.add_composite_file("tmp.tar.gz", description="Compressed archive of compressed bed files", is_binary=True)
 
-    def set_meta(self, dataset, **kwd):
-        super().set_meta(dataset, **kwd)
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
         for fname in os.listdir(dataset.extra_files_path):
             if fname.startswith("chromosomes"):
                 dataset.metadata.chrom_bed = os.path.join(dataset.extra_files_path, fname)
@@ -581,7 +590,7 @@ class IdeasPre(Html):
                 dataset.metadata.tmp_archive = os.path.join(dataset.extra_files_path, fname)
         self.regenerate_primary_file(dataset)
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         rval = ["<html><head></head><body>"]
         rval.append("<h3>Files prepared for IDEAS</h3>")
         rval.append("<ul>")
@@ -591,7 +600,7 @@ class IdeasPre(Html):
         rval.append("</ul></body></html>\n")
         return "\n".join(rval)
 
-    def regenerate_primary_file(self, dataset):
+    def regenerate_primary_file(self, dataset: "DatasetInstance") -> None:
         # Cannot do this until we are setting metadata.
         rval = ["<html><head></head><body>"]
         rval.append("<h3>Files prepared for IDEAS</h3>")
@@ -645,18 +654,18 @@ class RexpBase(Html):
             is_binary=False,
         )
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         """
         This is called only at upload to write the html file
         cannot rename the datasets here - they come with the default unfortunately
         """
         return "<html><head></head><body>AutoGenerated Primary File for Composite Dataset</body></html>"
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Returns the mime type of the datatype"""
         return "text/html"
 
-    def get_phecols(self, phenolist, maxConc=20):
+    def get_phecols(self, phenolist: List, maxConc: int = 20) -> List:
         """
         sept 2009: cannot use whitespace to split - make a more complex structure here
         and adjust the methods that rely on this structure
@@ -677,7 +686,7 @@ class RexpBase(Html):
             if nrows == 0:  # set up from header
                 head = row
                 totcols = len(row)
-                concordance = [{} for x in head]  # list of dicts
+                concordance: List[Dict] = [{} for x in head]
             else:
                 for col, code in enumerate(row):  # keep column order correct
                     if col >= totcols:
@@ -755,7 +764,7 @@ class RexpBase(Html):
             p = []
         return "\n".join(p)
 
-    def set_peek(self, dataset, **kwd):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """
         expects a .pheno file in the extra_files_dir - ugh
         note that R is weird and does not include the row.name in
@@ -804,7 +813,7 @@ class RexpBase(Html):
         except Exception:
             return "## rexpression get_file_peek: no file found"
 
-    def regenerate_primary_file(self, dataset):
+    def regenerate_primary_file(self, dataset: "DatasetInstance") -> None:
         """
         cannot do this until we are setting metadata
         """
@@ -821,23 +830,23 @@ class RexpBase(Html):
             f.write("\n".join(rval))
             f.write("\n")
 
-    def init_meta(self, dataset, copy_from=None):
+    def init_meta(self, dataset: "DatasetInstance", copy_from: Optional["DatasetInstance"] = None) -> None:
         if copy_from:
             dataset.metadata = copy_from.metadata
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         NOTE we apply the tabular machinary to the phenodata extracted
         from a BioC eSet or affybatch.
 
         """
-        super().set_meta(dataset, **kwd)
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
         try:
             flist = os.listdir(dataset.extra_files_path)
         except Exception:
             if verbose:
                 gal_Log.debug("@@@rexpression set_meta failed - no dataset?")
-            return False
+            return
         bn = dataset.metadata.base_name
         if not bn:
             for f in flist:
@@ -876,16 +885,13 @@ class RexpBase(Html):
             dataset.info = "Galaxy Expression datatype object"
         if not dataset.blurb:
             dataset.blurb = "R loadable BioC expression object for the Rexpression Galaxy toolkit"
-        return True
 
-    def make_html_table(self, pp="nothing supplied from peek\n"):
+    def make_html_table(self, pp: str = "nothing supplied from peek\n") -> str:
         """
         Create HTML table, used for displaying peek
         """
-        out = [
-            '<table cellspacing="0" cellpadding="3">',
-        ]
         try:
+            out = ['<table cellspacing="0" cellpadding="3">']
             # Generate column header
             p = pp.split("\n")
             for i, row in enumerate(p):
@@ -900,12 +906,11 @@ class RexpBase(Html):
                     orow.append("</tr>")
                 out.append("".join(orow))
             out.append("</table>")
-            out = "\n".join(out)
+            return "\n".join(out)
         except Exception as exc:
-            out = f"Can't create html table {unicodify(exc)}"
-        return out
+            return f"Can't create html table {unicodify(exc)}"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """
         Returns formatted html of peek
         """
@@ -993,7 +998,7 @@ class GenotypeMatrix(LinkageStudies):
     def __init__(self, **kwd):
         super().__init__(**kwd)
 
-    def header_check(self, fio):
+    def header_check(self, fio: IO) -> bool:
         header_elems = fio.readline().split("\t")
 
         if header_elems[0] != "Name":
@@ -1006,7 +1011,7 @@ class GenotypeMatrix(LinkageStudies):
 
         return True
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         >>> classname = GenotypeMatrix
         >>> from galaxy.datatypes.sniff import get_test_fname
@@ -1059,7 +1064,7 @@ class MarkerMap(LinkageStudies):
 
     file_ext = "linkage_map"
 
-    def header_check(self, fio):
+    def header_check(self, fio: IO) -> bool:
         headers = fio.readline().split()
 
         if len(headers) == 5 and headers[0] == "#Chr":
@@ -1067,7 +1072,7 @@ class MarkerMap(LinkageStudies):
 
         return False
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         >>> classname = MarkerMap
         >>> from galaxy.datatypes.sniff import get_test_fname
@@ -1103,7 +1108,7 @@ class MarkerMap(LinkageStudies):
                 try:
                     int(chrm)
                 except ValueError:
-                    if not chrm.lower()[0] in ("x", "y", "m"):
+                    if chrm.lower()[0] not in ("x", "y", "m"):
                         return False
 
             except ValueError:
@@ -1124,7 +1129,7 @@ class DataIn(LinkageStudies):
     def __init__(self, **kwd):
         super().__init__(**kwd)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         >>> classname = DataIn
         >>> from galaxy.datatypes.sniff import get_test_fname
@@ -1192,14 +1197,14 @@ class AllegroLOD(LinkageStudies):
 
     file_ext = "allegro_fparam"
 
-    def header_check(self, fio):
+    def header_check(self, fio: IO) -> bool:
         header = fio.readline().splitlines()[0].split()
         if len(header) == 4 and header == ["family", "location", "LOD", "marker"]:
             return True
 
         return False
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         >>> classname = AllegroLOD
         >>> from galaxy.datatypes.sniff import get_test_fname
diff --git a/lib/galaxy/datatypes/gis.py b/lib/galaxy/datatypes/gis.py
index 040db4495ed..ead789aa2d9 100644
--- a/lib/galaxy/datatypes/gis.py
+++ b/lib/galaxy/datatypes/gis.py
@@ -1,8 +1,13 @@
 """
 GIS classes
 """
+from typing import TYPE_CHECKING
 
 from galaxy.datatypes.binary import Binary
+from galaxy.datatypes.data import GeneratePrimaryFileDataset
+
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
 
 
 class Shapefile(Binary):
@@ -61,7 +66,7 @@ class Shapefile(Binary):
             "shapefile.shp.xml", description="Geospatial metadata in XML format (xml)", is_binary=False, optional=True
         )
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         rval = ["<html><head><title>Shapefile Galaxy Composite Dataset</title></head><p/>"]
         rval.append("<div>This composite dataset is composed of the following files:<p/><ul>")
         for composite_name, composite_file in self.get_composite_files(dataset=dataset).items():
@@ -78,7 +83,7 @@ class Shapefile(Binary):
         rval.append("</ul></div></html>\n")
         return "\n".join(rval)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text."""
         if not dataset.dataset.purged:
             dataset.peek = "Shapefile data"
@@ -87,7 +92,7 @@ class Shapefile(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Create HTML content, used for displaying peek."""
         try:
             return dataset.peek
diff --git a/lib/galaxy/datatypes/goldenpath.py b/lib/galaxy/datatypes/goldenpath.py
index b21ddb3b07b..d5ef0405449 100644
--- a/lib/galaxy/datatypes/goldenpath.py
+++ b/lib/galaxy/datatypes/goldenpath.py
@@ -3,6 +3,7 @@ import logging
 import os
 from typing import (
     Set,
+    TYPE_CHECKING,
     Union,
 )
 
@@ -13,6 +14,9 @@ from galaxy.datatypes.sniff import (
 )
 from .tabular import Tabular
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 
@@ -23,12 +27,12 @@ class GoldenPath(Tabular):
     edam_format = "format_3693"
     file_ext = "agp"
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         # AGPFile reads and validates entire file.
         AGPFile(dataset.file_name)
-        super().set_meta(dataset, **kwd)
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Checks for and does cursory validation on data that looks like AGP
 
diff --git a/lib/galaxy/datatypes/graph.py b/lib/galaxy/datatypes/graph.py
index 7b3f5c97cfb..babdb0c8489 100644
--- a/lib/galaxy/datatypes/graph.py
+++ b/lib/galaxy/datatypes/graph.py
@@ -2,7 +2,14 @@
 Graph content classes.
 """
 import logging
+from typing import (
+    List,
+    TYPE_CHECKING,
+)
 
+from galaxy.datatypes.dataproviders.column import ColumnarDataProvider
+from galaxy.datatypes.dataproviders.dataset import DatasetDataProvider
+from galaxy.datatypes.dataproviders.hierarchy import XMLDataProvider
 from galaxy.util import simplegraph
 from . import (
     data,
@@ -11,6 +18,9 @@ from . import (
     xml,
 )
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 
@@ -23,7 +33,7 @@ class Xgmml(xml.GenericXml):
 
     file_ext = "xgmml"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """
         Set the peek and blurb text
         """
@@ -34,14 +44,14 @@ class Xgmml(xml.GenericXml):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """
         Returns false and the user must manually set.
         """
         return False
 
     @staticmethod
-    def merge(split_files, output_file):
+    def merge(split_files: List[str], output_file: str) -> None:
         """
         Merging multiple XML files is non-trivial and must be done in subclasses.
         """
@@ -52,9 +62,9 @@ class Xgmml(xml.GenericXml):
         # For one file only, use base class method (move/copy)
         data.Text.merge(split_files, output_file)
 
-    @dataproviders.decorators.dataprovider_factory("node-edge", dataproviders.hierarchy.XMLDataProvider.settings)
-    def node_edge_dataprovider(self, dataset, **settings):
-        dataset_source = dataproviders.dataset.DatasetDataProvider(dataset)
+    @dataproviders.decorators.dataprovider_factory("node-edge", XMLDataProvider.settings)
+    def node_edge_dataprovider(self, dataset: "DatasetInstance", **settings) -> "XGMMLGraphDataProvider":
+        dataset_source = DatasetDataProvider(dataset)
         return XGMMLGraphDataProvider(dataset_source, **settings)
 
 
@@ -71,7 +81,7 @@ class Sif(tabular.Tabular):
 
     file_ext = "sif"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """
         Set the peek and blurb text
         """
@@ -82,24 +92,24 @@ class Sif(tabular.Tabular):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """
         Returns false and the user must manually set.
         """
         return False
 
     @staticmethod
-    def merge(split_files, output_file):
+    def merge(split_files: List[str], output_file: str) -> None:
         data.Text.merge(split_files, output_file)
 
-    @dataproviders.decorators.dataprovider_factory("node-edge", dataproviders.column.ColumnarDataProvider.settings)
-    def node_edge_dataprovider(self, dataset, **settings):
-        dataset_source = dataproviders.dataset.DatasetDataProvider(dataset)
+    @dataproviders.decorators.dataprovider_factory("node-edge", ColumnarDataProvider.settings)
+    def node_edge_dataprovider(self, dataset: "DatasetInstance", **settings) -> "SIFGraphDataProvider":
+        dataset_source = DatasetDataProvider(dataset)
         return SIFGraphDataProvider(dataset_source, **settings)
 
 
 # ----------------------------------------------------------------------------- graph specific data providers
-class XGMMLGraphDataProvider(dataproviders.hierarchy.XMLDataProvider):
+class XGMMLGraphDataProvider(XMLDataProvider):
     """
     Provide two lists: nodes, edges::
 
@@ -133,7 +143,7 @@ class XGMMLGraphDataProvider(dataproviders.hierarchy.XMLDataProvider):
         yield graph.as_dict()
 
 
-class SIFGraphDataProvider(dataproviders.column.ColumnarDataProvider):
+class SIFGraphDataProvider(ColumnarDataProvider):
     """
     Provide two lists: nodes, edges::
 
diff --git a/lib/galaxy/datatypes/hdf5.py b/lib/galaxy/datatypes/hdf5.py
index 5db73b211ab..6a2b42c58be 100644
--- a/lib/galaxy/datatypes/hdf5.py
+++ b/lib/galaxy/datatypes/hdf5.py
@@ -2,10 +2,20 @@
 
 This datatype was created for use with the iSEE interactive tool.
 """
+from typing import (
+    Optional,
+    TYPE_CHECKING,
+)
 
-from galaxy.datatypes.data import Data
+from galaxy.datatypes.data import (
+    Data,
+    GeneratePrimaryFileDataset,
+)
 from galaxy.datatypes.metadata import MetadataElement
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 
 class HDF5SummarizedExperiment(Data):
     """Composite datatype to represent HDF5SummarizedExperiment objects.
@@ -46,11 +56,11 @@ class HDF5SummarizedExperiment(Data):
             description="Summarized experiment data array",
         )
 
-    def init_meta(self, dataset, copy_from=None):
+    def init_meta(self, dataset: "DatasetInstance", copy_from: Optional["DatasetInstance"] = None) -> None:
         """Override parent init metadata."""
         Data.init_meta(self, dataset, copy_from=copy_from)
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         """Generate primary file to represent dataset."""
         return f"""
               <html>
@@ -67,9 +77,12 @@ class HDF5SummarizedExperiment(Data):
               </html>
               """
 
-    def sniff(self, filename):
-        """Not sure whether this is necessary (or possible) with binaries."""
+    def sniff(self, filename: str) -> bool:
+        """
+        Returns false and the user must manually set.
+        """
+        return False
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Return the mime type of the datatype."""
         return "text/html"
diff --git a/lib/galaxy/datatypes/images.py b/lib/galaxy/datatypes/images.py
index a9e83371474..8dd6f79b7c6 100644
--- a/lib/galaxy/datatypes/images.py
+++ b/lib/galaxy/datatypes/images.py
@@ -4,12 +4,17 @@ Image classes
 import base64
 import json
 import logging
+from typing import (
+    Optional,
+    TYPE_CHECKING,
+)
 
 import mrcfile
 import numpy as np
 import tifffile
 
 from galaxy.datatypes.binary import Binary
+from galaxy.datatypes.data import GeneratePrimaryFileDataset
 from galaxy.datatypes.metadata import (
     FileParameter,
     MetadataElement,
@@ -24,6 +29,9 @@ from galaxy.util.image_util import check_image_type
 from . import data
 from .xml import GenericXml
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 # TODO: Uploading image files of various types is supported in Galaxy, but on
@@ -48,7 +56,7 @@ class Image(data.Data):
         super().__init__(**kwd)
         self.image_formats = [self.file_ext.upper()]
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = f"Image in {dataset.extension} format"
             dataset.blurb = nice_size(dataset.get_size())
@@ -56,11 +64,11 @@ class Image(data.Data):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """Determine if the file is in this format"""
         return check_image_type(filename, self.image_formats)
 
-    def handle_dataset_as_image(self, hda):
+    def handle_dataset_as_image(self, hda: "DatasetInstance") -> str:
         dataset = hda.dataset
         name = hda.name or ""
         with open(dataset.file_name, "rb") as f:
@@ -99,7 +107,9 @@ class OMETiff(Tiff):
         optional=True,
     )
 
-    def set_meta(self, dataset, overwrite=True, metadata_tmp_files_dir=None, **kwd):
+    def set_meta(
+        self, dataset: "DatasetInstance", overwrite: bool = True, metadata_tmp_files_dir: Optional[str] = None, **kwd
+    ) -> None:
         spec_key = "offsets"
         offsets_file = dataset.metadata.offsets
         if not offsets_file:
@@ -112,7 +122,7 @@ class OMETiff(Tiff):
             json.dump(offsets, f)
         dataset.metadata.offsets = offsets_file
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         with tifffile.TiffFile(filename) as tif:
             if tif.is_ome:
                 return True
@@ -209,7 +219,7 @@ class Pdf(Image):
     edam_format = "format_3508"
     file_ext = "pdf"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """Determine if the file is in pdf format."""
         with open(filename, "rb") as fh:
             return fh.read(4) == b"%PDF"
@@ -232,7 +242,7 @@ class Tck(Binary):
 
     file_ext = "tck"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         format_def = [
             [b"mrtrix tracks"],
             [b"datatype: Float32LE", b"datatype: Float32BE", b"datatype: Float64BE", b"datatype: Float64LE"],
@@ -268,7 +278,7 @@ class Trk(Binary):
 
     file_ext = "trk"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         # quick check
         header_raw = None
         header_raw = file_prefix.contents_header_bytes[:1000]
@@ -329,7 +339,7 @@ class Mrc2014(Binary):
 
     file_ext = "mrc"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         try:
             # An exception is thrown
             # if the file is not an
@@ -346,7 +356,7 @@ class Gmaj(data.Data):
     edam_format = "format_3547"
     file_ext = "gmaj.zip"
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Returns the mime type of the datatype"""
         return "application/zip"
 
@@ -373,7 +383,7 @@ class Analyze75(Binary):
 
         self.add_composite_file("t2m", description="The Analyze75 t2m file.", optional=True, is_binary=True)
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         rval = ["<html><head><title>Analyze75 Composite Dataset.</title></head><p/>"]
         rval.append("<div>This composite dataset is composed of the following files:<p/><ul>")
         for composite_name, composite_file in self.get_composite_files(dataset=dataset).items():
@@ -408,7 +418,7 @@ class Nifti1(Binary):
 
     file_ext = "nii1"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         magic = file_prefix.contents_header_bytes[344:348]
         if magic == b"n+1\0":
             return True
@@ -432,7 +442,7 @@ class Nifti2(Binary):
 
     file_ext = "nii2"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         magic = file_prefix.contents_header_bytes[4:8]
         if magic in [b"n+2\0", b"ni2\0"]:
             return True
@@ -445,7 +455,7 @@ class Gifti(GenericXml):
 
     file_ext = "gii"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """Determines whether the file is a Gifti file
 
         >>> from galaxy.datatypes.sniff import get_test_fname
@@ -483,7 +493,7 @@ class Star(data.Text):
 
     file_ext = "star"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -492,7 +502,7 @@ class Star(data.Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """Each file must have one or more data blocks.
         The start of a data block is defined by the keyword
         ``data_`` followed by an optional string for
diff --git a/lib/galaxy/datatypes/interval.py b/lib/galaxy/datatypes/interval.py
index 1580c4e2f8b..2c4e710d9e1 100644
--- a/lib/galaxy/datatypes/interval.py
+++ b/lib/galaxy/datatypes/interval.py
@@ -2,9 +2,16 @@
 Interval datatypes
 """
 import logging
-import math
 import sys
 import tempfile
+from typing import (
+    cast,
+    List,
+    Optional,
+    Tuple,
+    TYPE_CHECKING,
+    Union,
+)
 from urllib.parse import quote_plus
 
 import pysam
@@ -16,6 +23,12 @@ from bx.intervals.io import (
 from galaxy import util
 from galaxy.datatypes import metadata
 from galaxy.datatypes.data import DatatypeValidation
+from galaxy.datatypes.dataproviders.dataset import (
+    DatasetDataProvider,
+    GenomicRegionDataProvider,
+    IntervalDataProvider,
+    WiggleDataProvider,
+)
 from galaxy.datatypes.metadata import MetadataElement
 from galaxy.datatypes.sniff import (
     build_sniff_from_prefix,
@@ -28,13 +41,16 @@ from galaxy.datatypes.util.gff_util import (
     parse_gff3_attributes,
     parse_gff_attributes,
 )
-from galaxy.model import DatasetInstance
 from galaxy.util import compression_utils
+from galaxy.util.compression_utils import FileObjType
 from . import (
     data,
     dataproviders,
 )
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 # Contains the meta columns and the words that map to it; list aliases on the
@@ -107,10 +123,12 @@ class Interval(Tabular):
         Tabular.__init__(self, **kwd)
         self.add_display_app("ucsc", "display at UCSC", "as_ucsc_display_file", "ucsc_links")
 
-    def init_meta(self, dataset, copy_from=None):
+    def init_meta(self, dataset: "DatasetInstance", copy_from: Optional["DatasetInstance"] = None) -> None:
         Tabular.init_meta(self, dataset, copy_from=copy_from)
 
-    def set_meta(self, dataset, overwrite=True, first_line_is_header=False, **kwd):
+    def set_meta(
+        self, dataset: "DatasetInstance", *, overwrite: bool = True, first_line_is_header: bool = False, **kwd
+    ) -> None:
         """Tries to guess from the line the location number of the column for the chromosome, region start-end and strand"""
         Tabular.set_meta(self, dataset, overwrite=overwrite, skip=0)
         if dataset.has_data():
@@ -170,7 +188,7 @@ class Interval(Tabular):
                     else:
                         empty_line_count += 1
 
-    def displayable(self, dataset: DatasetInstance):
+    def displayable(self, dataset: "DatasetInstance"):
         try:
             return (
                 not dataset.dataset.purged
@@ -185,7 +203,13 @@ class Interval(Tabular):
         except Exception:
             return False
 
-    def get_estimated_display_viewport(self, dataset, chrom_col=None, start_col=None, end_col=None):
+    def get_estimated_display_viewport(
+        self,
+        dataset: "DatasetInstance",
+        chrom_col: Optional[int] = None,
+        start_col: Optional[int] = None,
+        end_col: Optional[int] = None,
+    ) -> Tuple[Optional[str], Optional[str], Optional[str]]:
         """Return a chrom, start, stop tuple for viewing a file."""
         viewport_feature_count = 100  # viewport should check at least 100 features; excludes comment lines
         max_line_count = max(viewport_feature_count, 500)  # maximum number of lines to check; includes comment lines
@@ -243,7 +267,7 @@ class Interval(Tabular):
             log.exception("Exception caught attempting to generate viewport for dataset '%d'", dataset.id)
         return (None, None, None)
 
-    def as_ucsc_display_file(self, dataset, **kwd):
+    def as_ucsc_display_file(self, dataset: "DatasetInstance", **kwd) -> Union[FileObjType, str]:
         """Returns file contents with only the bed data"""
         with tempfile.NamedTemporaryFile(delete=False, mode="w") as fh:
             c, s, e, t, n = (
@@ -259,16 +283,16 @@ class Interval(Tabular):
                     strand = "+"
                     name = "region_%i" % i
                     if n >= 0 and n < len(elems):
-                        name = elems[n]
+                        name = cast(str, elems[n])
                     if t < len(elems):
-                        strand = elems[t]
+                        strand = cast(str, elems[t])
                     tmp = [elems[c], elems[s], elems[e], name, "0", strand]
                     fh.write("%s\n" % "\t".join(tmp))
             elif n >= 0:  # name column (should) exists
                 for i, elems in enumerate(compression_utils.file_iter(dataset.file_name)):
                     name = "region_%i" % i
                     if n >= 0 and n < len(elems):
-                        name = elems[n]
+                        name = cast(str, elems[n])
                     tmp = [elems[c], elems[s], elems[e], name]
                     fh.write("%s\n" % "\t".join(tmp))
             else:
@@ -277,7 +301,7 @@ class Interval(Tabular):
                     fh.write("%s\n" % "\t".join(tmp))
             return compression_utils.get_fileobj(fh.name, mode="rb")
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Returns formated html of peek"""
         return self.make_html_table(
             dataset,
@@ -290,7 +314,7 @@ class Interval(Tabular):
             },
         )
 
-    def ucsc_links(self, dataset, type, app, base_url):
+    def ucsc_links(self, dataset: "DatasetInstance", type: str, app, base_url: str) -> List:
         """
         Generate links to UCSC genome browser sites based on the dbkey
         and content of dataset.
@@ -324,7 +348,7 @@ class Interval(Tabular):
             ret_val.append((site_name, link))
         return ret_val
 
-    def validate(self, dataset, **kwd):
+    def validate(self, dataset: "DatasetInstance", **kwd) -> DatatypeValidation:
         """Validate an interval file using the bx GenomicIntervalReader"""
         c, s, e, t = (
             dataset.metadata.chromCol,
@@ -344,11 +368,7 @@ class Interval(Tabular):
                 except StopIteration:
                     return DatatypeValidation.validated()
 
-    def repair_methods(self, dataset):
-        """Return options for removing errors along with a description"""
-        return [("lines", "Remove erroneous lines")]
-
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Checks for 'intervalness'
 
@@ -381,29 +401,22 @@ class Interval(Tabular):
             return False
         return found_valid_lines
 
-    def get_track_resolution(self, dataset, start, end):
-        return None
-
     # ------------- Dataproviders
-    @dataproviders.decorators.dataprovider_factory(
-        "genomic-region", dataproviders.dataset.GenomicRegionDataProvider.settings
-    )
-    def genomic_region_dataprovider(self, dataset, **settings):
-        return dataproviders.dataset.GenomicRegionDataProvider(dataset, **settings)
+    @dataproviders.decorators.dataprovider_factory("genomic-region", GenomicRegionDataProvider.settings)
+    def genomic_region_dataprovider(self, dataset: "DatasetInstance", **settings) -> GenomicRegionDataProvider:
+        return GenomicRegionDataProvider(dataset, **settings)
 
-    @dataproviders.decorators.dataprovider_factory(
-        "genomic-region-dict", dataproviders.dataset.GenomicRegionDataProvider.settings
-    )
-    def genomic_region_dict_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("genomic-region-dict", GenomicRegionDataProvider.settings)
+    def genomic_region_dict_dataprovider(self, dataset: "DatasetInstance", **settings) -> GenomicRegionDataProvider:
         settings["named_columns"] = True
         return self.genomic_region_dataprovider(dataset, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("interval", dataproviders.dataset.IntervalDataProvider.settings)
-    def interval_dataprovider(self, dataset, **settings):
-        return dataproviders.dataset.IntervalDataProvider(dataset, **settings)
+    @dataproviders.decorators.dataprovider_factory("interval", IntervalDataProvider.settings)
+    def interval_dataprovider(self, dataset: "DatasetInstance", **settings) -> IntervalDataProvider:
+        return IntervalDataProvider(dataset, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("interval-dict", dataproviders.dataset.IntervalDataProvider.settings)
-    def interval_dict_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("interval-dict", IntervalDataProvider.settings)
+    def interval_dict_dataprovider(self, dataset: "DatasetInstance", **settings) -> IntervalDataProvider:
         settings["named_columns"] = True
         return self.interval_dataprovider(dataset, **settings)
 
@@ -416,14 +429,20 @@ class BedGraph(Interval):
     track_type = "LineTrack"
     data_sources = {"data": "bigwig", "index": "bigwig"}
 
-    def as_ucsc_display_file(self, dataset, **kwd):
+    def as_ucsc_display_file(self, dataset: "DatasetInstance", **kwd) -> Union[FileObjType, str]:
         """
         Returns file contents as is with no modifications.
         TODO: this is a functional stub and will need to be enhanced moving forward to provide additional support for bedgraph.
         """
         return open(dataset.file_name, "rb")
 
-    def get_estimated_display_viewport(self, dataset, chrom_col=0, start_col=1, end_col=2):
+    def get_estimated_display_viewport(
+        self,
+        dataset: "DatasetInstance",
+        chrom_col: Optional[int] = 0,
+        start_col: Optional[int] = 1,
+        end_col: Optional[int] = 2,
+    ) -> Tuple[Optional[str], Optional[str], Optional[str]]:
         """
         Set viewport based on dataset's first 100 lines.
         """
@@ -478,7 +497,7 @@ class Bed(Interval):
     )
     # do we need to repeat these? they are the same as should be inherited from interval type
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """Sets the metadata information for datasets previously determined to be in bed format."""
         if dataset.has_data():
             i = 0
@@ -499,7 +518,7 @@ class Bed(Interval):
                         break
             Tabular.set_meta(self, dataset, overwrite=overwrite, skip=i)
 
-    def as_ucsc_display_file(self, dataset, **kwd):
+    def as_ucsc_display_file(self, dataset: "DatasetInstance", **kwd) -> Union[FileObjType, str]:
         """Returns file contents with only the bed data. If bed 6+, treat as interval."""
         for line in open(dataset.file_name):
             line = line.strip()
@@ -541,7 +560,7 @@ class Bed(Interval):
         except Exception:
             return "This item contains no content"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Checks for 'bedness'
 
@@ -711,14 +730,14 @@ class BedStrict(Bed):
         Tabular.__init__(self, **kwd)
         self.clear_display_apps()  # only new style display applications for this datatype
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         Tabular.set_meta(self, dataset, overwrite=overwrite, **kwd)  # need column count first
         if dataset.metadata.columns >= 4:
             dataset.metadata.nameCol = 4
             if dataset.metadata.columns >= 6:
                 dataset.metadata.strandCol = 6
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         return False  # NOTE: This would require aggressively validating the entire file
 
 
@@ -737,7 +756,9 @@ class Bed12(BedStrict):
 
 
 class _RemoteCallMixin:
-    def _get_remote_call_url(self, redirect_url, site_name, dataset, type, app, base_url):
+    def _get_remote_call_url(
+        self, redirect_url: str, site_name: str, dataset: "DatasetInstance", type: str, app, base_url: str
+    ) -> str:
         """Retrieve the URL to call out to an external site and retrieve data.
         This routes our external URL through a local galaxy instance which makes
         the data available, followed by redirecting to the remote site with a
@@ -793,7 +814,7 @@ class Gff(Tabular, _RemoteCallMixin):
         self.add_display_app("ucsc", "display at UCSC", "as_ucsc_display_file", "ucsc_links")
         self.add_display_app("gbrowse", "display in Gbrowse", "as_gbrowse_display_file", "gbrowse_links")
 
-    def set_attribute_metadata(self, dataset):
+    def set_attribute_metadata(self, dataset: "DatasetInstance") -> None:
         """
         Sets metadata elements for dataset's attributes.
         """
@@ -833,7 +854,7 @@ class Gff(Tabular, _RemoteCallMixin):
         dataset.metadata.attribute_types = attribute_types
         dataset.metadata.attributes = len(attribute_types)
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         self.set_attribute_metadata(dataset)
 
         i = 0
@@ -851,11 +872,13 @@ class Gff(Tabular, _RemoteCallMixin):
                             pass
         Tabular.set_meta(self, dataset, overwrite=overwrite, skip=i)
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Returns formated html of peek"""
         return self.make_html_table(dataset, column_names=self.column_names)
 
-    def get_estimated_display_viewport(self, dataset):
+    def get_estimated_display_viewport(
+        self, dataset: "DatasetInstance"
+    ) -> Tuple[Optional[str], Optional[str], Optional[str]]:
         """
         Return a chrom, start, stop tuple for viewing a file.  There are slight differences between gff 2 and gff 3
         formats.  This function should correctly handle both...
@@ -930,7 +953,7 @@ class Gff(Tabular, _RemoteCallMixin):
                 log.exception("Unexpected error")
         return (None, None, None)  # could not determine viewport
 
-    def ucsc_links(self, dataset, type, app, base_url):
+    def ucsc_links(self, dataset: "DatasetInstance", type: str, app, base_url: str) -> List:
         ret_val = []
         seqid, start, stop = self.get_estimated_display_viewport(dataset)
         if seqid is not None:
@@ -943,7 +966,7 @@ class Gff(Tabular, _RemoteCallMixin):
                     ret_val.append((site_name, link))
         return ret_val
 
-    def gbrowse_links(self, dataset, type, app, base_url):
+    def gbrowse_links(self, dataset: "DatasetInstance", type: str, app, base_url: str) -> List:
         ret_val = []
         seqid, start, stop = self.get_estimated_display_viewport(dataset)
         if seqid is not None:
@@ -956,7 +979,7 @@ class Gff(Tabular, _RemoteCallMixin):
                     ret_val.append((site_name, link))
         return ret_val
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in gff format
 
@@ -1008,25 +1031,21 @@ class Gff(Tabular, _RemoteCallMixin):
 
     # ------------- Dataproviders
     # redefine bc super is Tabular
-    @dataproviders.decorators.dataprovider_factory(
-        "genomic-region", dataproviders.dataset.GenomicRegionDataProvider.settings
-    )
-    def genomic_region_dataprovider(self, dataset, **settings):
-        return dataproviders.dataset.GenomicRegionDataProvider(dataset, 0, 3, 4, **settings)
+    @dataproviders.decorators.dataprovider_factory("genomic-region", GenomicRegionDataProvider.settings)
+    def genomic_region_dataprovider(self, dataset: "DatasetInstance", **settings) -> GenomicRegionDataProvider:
+        return GenomicRegionDataProvider(dataset, 0, 3, 4, **settings)
 
-    @dataproviders.decorators.dataprovider_factory(
-        "genomic-region-dict", dataproviders.dataset.GenomicRegionDataProvider.settings
-    )
-    def genomic_region_dict_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("genomic-region-dict", GenomicRegionDataProvider.settings)
+    def genomic_region_dict_dataprovider(self, dataset: "DatasetInstance", **settings) -> GenomicRegionDataProvider:
         settings["named_columns"] = True
         return self.genomic_region_dataprovider(dataset, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("interval", dataproviders.dataset.IntervalDataProvider.settings)
-    def interval_dataprovider(self, dataset, **settings):
-        return dataproviders.dataset.IntervalDataProvider(dataset, 0, 3, 4, 6, 2, **settings)
+    @dataproviders.decorators.dataprovider_factory("interval", IntervalDataProvider.settings)
+    def interval_dataprovider(self, dataset: "DatasetInstance", **settings):
+        return IntervalDataProvider(dataset, 0, 3, 4, 6, 2, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("interval-dict", dataproviders.dataset.IntervalDataProvider.settings)
-    def interval_dict_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("interval-dict", IntervalDataProvider.settings)
+    def interval_dict_dataprovider(self, dataset: "DatasetInstance", **settings):
         settings["named_columns"] = True
         return self.interval_dataprovider(dataset, **settings)
 
@@ -1054,7 +1073,7 @@ class Gff3(Gff):
         """Initialize datatype, by adding GBrowse display app"""
         Gff.__init__(self, **kwd)
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         self.set_attribute_metadata(dataset)
         i = 0
         with compression_utils.get_fileobj(dataset.file_name) as in_fh:
@@ -1089,7 +1108,7 @@ class Gff3(Gff):
                             break
         Tabular.set_meta(self, dataset, overwrite=overwrite, skip=i)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in GFF version 3 format
 
@@ -1184,7 +1203,7 @@ class Gtf(Gff):
         visible=False,
     )
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in gtf format
 
@@ -1269,7 +1288,9 @@ class Wiggle(Tabular, _RemoteCallMixin):
         self.add_display_app("ucsc", "display at UCSC", "as_ucsc_display_file", "ucsc_links")
         self.add_display_app("gbrowse", "display in Gbrowse", "as_gbrowse_display_file", "gbrowse_links")
 
-    def get_estimated_display_viewport(self, dataset):
+    def get_estimated_display_viewport(
+        self, dataset: "DatasetInstance"
+    ) -> Tuple[Optional[str], Optional[str], Optional[str]]:
         """Return a chrom, start, stop tuple for viewing a file."""
         viewport_feature_count = 100  # viewport should check at least 100 features; excludes comment lines
         max_line_count = max(viewport_feature_count, 500)  # maximum number of lines to check; includes comment lines
@@ -1334,7 +1355,7 @@ class Wiggle(Tabular, _RemoteCallMixin):
                 log.exception("Unexpected error")
         return (None, None, None)  # could not determine viewport
 
-    def gbrowse_links(self, dataset, type, app, base_url):
+    def gbrowse_links(self, dataset: "DatasetInstance", type: str, app, base_url: str) -> List:
         ret_val = []
         chrom, start, stop = self.get_estimated_display_viewport(dataset)
         if chrom is not None:
@@ -1347,7 +1368,7 @@ class Wiggle(Tabular, _RemoteCallMixin):
                     ret_val.append((site_name, link))
         return ret_val
 
-    def ucsc_links(self, dataset, type, app, base_url):
+    def ucsc_links(self, dataset: "DatasetInstance", type: str, app, base_url: str) -> List:
         ret_val = []
         chrom, start, stop = self.get_estimated_display_viewport(dataset)
         if chrom is not None:
@@ -1360,11 +1381,11 @@ class Wiggle(Tabular, _RemoteCallMixin):
                     ret_val.append((site_name, link))
         return ret_val
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Returns formated html of peek"""
         return self.make_html_table(dataset, skipchars=["track", "#"])
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         max_data_lines = None
         i = 0
         for i, line in enumerate(open(dataset.file_name)):  # noqa: B007
@@ -1388,7 +1409,7 @@ class Wiggle(Tabular, _RemoteCallMixin):
             max_data_lines = 100
         Tabular.set_meta(self, dataset, overwrite=overwrite, skip=i, max_data_lines=max_data_lines)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines wether the file is in wiggle format
 
@@ -1420,26 +1441,17 @@ class Wiggle(Tabular, _RemoteCallMixin):
         except Exception:
             return False
 
-    def get_track_resolution(self, dataset, start, end):
-        range = end - start
-        # Determine appropriate resolution to plot ~1000 points
-        resolution = math.ceil(10 ** math.ceil(math.log10(range / 1000)))
-        # Restrict to valid range
-        resolution = min(resolution, 100000)
-        resolution = max(resolution, 1)
-        return resolution
-
     # ------------- Dataproviders
-    @dataproviders.decorators.dataprovider_factory("wiggle", dataproviders.dataset.WiggleDataProvider.settings)
-    def wiggle_dataprovider(self, dataset, **settings):
-        dataset_source = dataproviders.dataset.DatasetDataProvider(dataset)
-        return dataproviders.dataset.WiggleDataProvider(dataset_source, **settings)
+    @dataproviders.decorators.dataprovider_factory("wiggle", WiggleDataProvider.settings)
+    def wiggle_dataprovider(self, dataset: "DatasetInstance", **settings) -> WiggleDataProvider:
+        dataset_source = DatasetDataProvider(dataset)
+        return WiggleDataProvider(dataset_source, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("wiggle-dict", dataproviders.dataset.WiggleDataProvider.settings)
-    def wiggle_dict_dataprovider(self, dataset, **settings):
-        dataset_source = dataproviders.dataset.DatasetDataProvider(dataset)
+    @dataproviders.decorators.dataprovider_factory("wiggle-dict", WiggleDataProvider.settings)
+    def wiggle_dict_dataprovider(self, dataset: "DatasetInstance", **settings) -> WiggleDataProvider:
+        dataset_source = DatasetDataProvider(dataset)
         settings["named_columns"] = True
-        return dataproviders.dataset.WiggleDataProvider(dataset_source, **settings)
+        return WiggleDataProvider(dataset_source, **settings)
 
 
 @build_sniff_from_prefix
@@ -1454,14 +1466,20 @@ class CustomTrack(Tabular):
         Tabular.__init__(self, **kwd)
         self.add_display_app("ucsc", "display at UCSC", "as_ucsc_display_file", "ucsc_links")
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         Tabular.set_meta(self, dataset, overwrite=overwrite, skip=1)
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Returns formated html of peek"""
         return self.make_html_table(dataset, skipchars=["track", "#"])
 
-    def get_estimated_display_viewport(self, dataset, chrom_col=None, start_col=None, end_col=None):
+    def get_estimated_display_viewport(
+        self,
+        dataset: "DatasetInstance",
+        chrom_col: Optional[int] = None,
+        start_col: Optional[int] = None,
+        end_col: Optional[int] = None,
+    ) -> Tuple[Optional[str], Optional[str], Optional[str]]:
         """Return a chrom, start, stop tuple for viewing a file."""
         # FIXME: only BED and WIG custom tracks are currently supported
         # As per previously existing behavior, viewport will only be over the first intervals
@@ -1519,7 +1537,7 @@ class CustomTrack(Tabular):
                 log.exception("Unexpected error")
         return (None, None, None)  # could not determine viewport
 
-    def ucsc_links(self, dataset, type, app, base_url):
+    def ucsc_links(self, dataset: "DatasetInstance", type: str, app, base_url: str) -> List:
         ret_val = []
         chrom, start, stop = self.get_estimated_display_viewport(dataset)
         if chrom is not None:
@@ -1537,7 +1555,7 @@ class CustomTrack(Tabular):
                     ret_val.append((site_name, link))
         return ret_val
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in customtrack format.
 
@@ -1625,7 +1643,7 @@ class ENCODEPeak(Interval):
     )
     MetadataElement(name="columns", default=3, desc="Number of columns", readonly=True, visible=False)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         return False
 
 
@@ -1649,7 +1667,7 @@ class ChromatinInteractions(Interval):
 
     MetadataElement(name="columns", default=7, desc="Number of columns", readonly=True, visible=False)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         return False
 
 
@@ -1698,7 +1716,7 @@ class ScIdx(Tabular):
         # line of the dataset displays them.
         self.column_names = ["chrom", "index", "forward", "reverse", "value"]
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Checks for 'scidx-ness.'
         """
@@ -1762,7 +1780,14 @@ class IntervalTabix(Interval):
         return False
 
     # Ideally the tabix_index would be regenerated when the metadataElements are updated
-    def set_meta(self, dataset, overwrite=True, first_line_is_header=False, metadata_tmp_files_dir=None, **kwd):
+    def set_meta(
+        self,
+        dataset: "DatasetInstance",
+        overwrite: bool = True,
+        first_line_is_header: bool = False,
+        metadata_tmp_files_dir: Optional[str] = None,
+        **kwd,
+    ) -> None:
         # We don't use the method Interval.set_meta as we don't want to guess the columns for chr start end
         Tabular.set_meta(self, dataset, overwrite=overwrite, skip=0)
         # Try to create the index for the Tabix file.
diff --git a/lib/galaxy/datatypes/isa.py b/lib/galaxy/datatypes/isa.py
index b83a9875abc..6b5f81687d2 100644
--- a/lib/galaxy/datatypes/isa.py
+++ b/lib/galaxy/datatypes/isa.py
@@ -11,6 +11,11 @@ import os.path
 import re
 import shutil
 import tempfile
+from typing import (
+    List,
+    Optional,
+    TYPE_CHECKING,
+)
 
 # Imports isatab after turning off warnings inside logger settings to avoid pandas warning making uploads fail.
 logging.getLogger("isatools.isatab").setLevel(logging.ERROR)
@@ -21,10 +26,21 @@ from isatools import (
 from markupsafe import escape
 
 from galaxy import util
-from galaxy.datatypes import data
+from galaxy.datatypes.data import (
+    Data,
+    GeneratePrimaryFileDataset,
+)
 from galaxy.util.compression_utils import CompressedFile
 from galaxy.util.sanitize_html import sanitize_html
 
+if TYPE_CHECKING:
+    from isatools.model import Investigation
+
+    from galaxy.model import (
+        DatasetInstance,
+        HistoryDatasetAssociation,
+    )
+
 # CONSTANTS {{{1
 ################################################################
 
@@ -51,23 +67,22 @@ logger = logging.getLogger(__name__)
 ################################################################
 
 
-class _Isa(data.Data):
+class _Isa(Data):
     """Base class for implementing ISA datatypes"""
 
     composite_type = "auto_primary_file"
     is_binary = True
-    _main_file_regex = None
 
     # Make investigation instance {{{2
     ################################################################
 
-    def _make_investigation_instance(self, filename):
+    def _make_investigation_instance(self, filename: str) -> "Investigation":
         raise NotImplementedError()
 
     # Constructor {{{2
     ################################################################
 
-    def __init__(self, main_file_regex, **kwd):
+    def __init__(self, main_file_regex: re.Pattern, **kwd) -> None:
         super().__init__(**kwd)
         self._main_file_regex = main_file_regex
 
@@ -77,7 +92,7 @@ class _Isa(data.Data):
     # Get ISA folder path {{{2
     ################################################################
 
-    def _get_isa_folder_path(self, dataset):
+    def _get_isa_folder_path(self, dataset: "DatasetInstance") -> str:
         isa_folder = dataset.extra_files_path
         if not isa_folder:
             raise Exception("Unvalid dataset object, or no extra files path found for this dataset.")
@@ -86,7 +101,7 @@ class _Isa(data.Data):
     # Get main file {{{2
     ################################################################
 
-    def _get_main_file(self, dataset):
+    def _get_main_file(self, dataset: "DatasetInstance") -> Optional[str]:
         """Get the main file of the ISA archive. Either the investigation file i_*.txt for ISA-Tab, or the JSON file for ISA-JSON."""
 
         main_file = None
@@ -104,6 +119,7 @@ class _Isa(data.Data):
                 raise Exception("Invalid ISA archive. No main file found.")
 
             # Make full path
+            assert main_file
             main_file = os.path.join(isa_folder, main_file)
 
         return main_file
@@ -111,7 +127,7 @@ class _Isa(data.Data):
     # Get investigation {{{2
     ################################################################
 
-    def _get_investigation(self, dataset):
+    def _get_investigation(self, dataset: "DatasetInstance") -> Optional["Investigation"]:
         """Create a contained instance specific to the exact ISA type (Tab or Json).
         We will use it to parse and access information from the archive."""
 
@@ -125,7 +141,7 @@ class _Isa(data.Data):
     # Find main file in archive {{{2
     ################################################################
 
-    def _find_main_file_in_archive(self, files_list):
+    def _find_main_file_in_archive(self, files_list: List) -> Optional[str]:
         """Find the main file inside the ISA archive."""
 
         found_file = None
@@ -134,7 +150,8 @@ class _Isa(data.Data):
             match = self._main_file_regex.match(f)
             if match:
                 if found_file is None:
-                    found_file = match.group()
+                    matched = match.group()  # can be string or tuple
+                    found_file = matched if isinstance(matched, str) else matched[0]
                 else:
                     raise Exception(
                         'More than one file match the pattern "',
@@ -147,7 +164,7 @@ class _Isa(data.Data):
     # Set peek {{{2
     ################################################################
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text. Get first lines of the main file and set it as the peek."""
 
         main_file = self._get_main_file(dataset)
@@ -157,7 +174,7 @@ class _Isa(data.Data):
 
         # Read first lines of main file
         with open(main_file, encoding="utf-8") as f:
-            data = []
+            data: List = []
             for line in f:
                 if len(data) < _MAX_LINES_HISTORY_PEEK:
                     data.append(line)
@@ -173,7 +190,7 @@ class _Isa(data.Data):
     # Display peek {{{2
     ################################################################
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Create the HTML table used for displaying peek, from the peek text found by set_peek() method."""
 
         out = ['<table cellspacing="0" cellpadding="3">']
@@ -194,7 +211,7 @@ class _Isa(data.Data):
     # Generate primary file {{{2
     ################################################################
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         """Generate the primary file. It is an HTML file containing description of the composite dataset
         as well as a list of the composite files that it contains."""
 
@@ -213,14 +230,14 @@ class _Isa(data.Data):
     # Dataset content needs grooming {{{2
     ################################################################
 
-    def dataset_content_needs_grooming(self, file_name):
+    def dataset_content_needs_grooming(self, file_name: str) -> bool:
         """This function is called on an output dataset file after the content is initially generated."""
         return os.path.basename(file_name) == ISA_ARCHIVE_NAME
 
     # Groom dataset content {{{2
     ################################################################
 
-    def groom_dataset_content(self, file_name):
+    def groom_dataset_content(self, file_name: str) -> None:
         """This method is called by Galaxy to extract files contained in a composite data type."""
         # XXX Is the right place to extract files? Should this step not be a cleaning step instead?
         # Could extracting be done earlier and composite files declared as files contained inside the archive
@@ -250,7 +267,17 @@ class _Isa(data.Data):
     # Display data {{{2
     ################################################################
 
-    def display_data(self, trans, dataset, preview=False, filename=None, to_ext=None, offset=None, ck_size=None, **kwd):
+    def display_data(
+        self,
+        trans,
+        dataset: "HistoryDatasetAssociation",
+        preview: bool = False,
+        filename: Optional[str] = None,
+        to_ext: Optional[str] = None,
+        offset: Optional[int] = None,
+        ck_size: Optional[int] = None,
+        **kwd,
+    ):
         """Downloads the ISA dataset if `preview` is `False`;
         if `preview` is `True`, it returns a preview of the ISA dataset as a HTML page.
         The preview is triggered when user clicks on the eye icon of the composite dataset."""
@@ -322,7 +349,7 @@ class IsaTab(_Isa):
     # Make investigation instance {{{2
     ################################################################
 
-    def _make_investigation_instance(self, filename):
+    def _make_investigation_instance(self, filename: str) -> "Investigation":
 
         # Parse ISA-Tab investigation file
         parser = isatab_meta.InvestigationParser()
@@ -356,7 +383,7 @@ class IsaJson(_Isa):
     # Make investigation instance {{{2
     ################################################################
 
-    def _make_investigation_instance(self, filename):
+    def _make_investigation_instance(self, filename: str) -> "Investigation":
 
         # Parse JSON file
         with open(filename, newline="", encoding="utf8") as fp:
diff --git a/lib/galaxy/datatypes/media.py b/lib/galaxy/datatypes/media.py
index 29c602395cd..987df7fc928 100644
--- a/lib/galaxy/datatypes/media.py
+++ b/lib/galaxy/datatypes/media.py
@@ -3,6 +3,11 @@ import json
 import subprocess
 import wave
 from functools import lru_cache
+from typing import (
+    List,
+    Tuple,
+    TYPE_CHECKING,
+)
 
 from galaxy.datatypes.binary import Binary
 from galaxy.datatypes.metadata import (
@@ -11,6 +16,9 @@ from galaxy.datatypes.metadata import (
 )
 from galaxy.util import which
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 
 @lru_cache(maxsize=128)
 def _ffprobe(path):
@@ -67,7 +75,7 @@ class Audio(Binary):
         no_value=0,
     )
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         if which("ffprobe"):
             metadata, streams = ffprobe(dataset.file_name)
 
@@ -143,7 +151,7 @@ class Video(Binary):
         no_value=0,
     )
 
-    def _get_resolution(self, streams):
+    def _get_resolution(self, streams: List) -> Tuple[int, int, float]:
         for stream in streams:
             if stream["codec_type"] == "video":
                 w = stream["width"]
@@ -154,7 +162,7 @@ class Video(Binary):
             w = h = fps = 0
         return w, h, fps
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         if which("ffprobe"):
             metadata, streams = ffprobe(dataset.file_name)
             (w, h, fps) = self._get_resolution(streams)
@@ -176,10 +184,11 @@ class Video(Binary):
 class Mkv(Video):
     file_ext = "mkv"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if which("ffprobe"):
             metadata, streams = ffprobe(filename)
             return "matroska" in metadata["format_name"].split(",")
+        return False
 
 
 class Mp4(Video):
@@ -194,28 +203,31 @@ class Mp4(Video):
 
     file_ext = "mp4"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if which("ffprobe"):
             metadata, streams = ffprobe(filename)
             return "mp4" in metadata["format_name"].split(",")
+        return False
 
 
 class Flv(Video):
     file_ext = "flv"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if which("ffprobe"):
             metadata, streams = ffprobe(filename)
             return "flv" in metadata["format_name"].split(",")
+        return False
 
 
 class Mpg(Video):
     file_ext = "mpg"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if which("ffprobe"):
             metadata, streams = ffprobe(filename)
             return "mpegvideo" in metadata["format_name"].split(",")
+        return False
 
 
 class Mp3(Audio):
@@ -230,10 +242,11 @@ class Mp3(Audio):
 
     file_ext = "mp3"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if which("ffprobe"):
             metadata, streams = ffprobe(filename)
             return "mp3" in metadata["format_name"].split(",")
+        return False
 
 
 class Wav(Audio):
@@ -262,15 +275,15 @@ class Wav(Audio):
         name="sampwidth", desc="Sample Width", default=0, no_value=0, readonly=True, visible=True, optional=True
     )
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Returns the mime type of the datatype."""
         return "audio/wav"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         with wave.open(filename, "rb"):
             return True
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """Set the metadata for this dataset from the file contents."""
         try:
             with wave.open(dataset.dataset.file_name, "rb") as fd:
diff --git a/lib/galaxy/datatypes/metacyto.py b/lib/galaxy/datatypes/metacyto.py
index 33e05752fb9..f866adf6d6f 100644
--- a/lib/galaxy/datatypes/metacyto.py
+++ b/lib/galaxy/datatypes/metacyto.py
@@ -15,7 +15,7 @@ class mStats(Tabular):
 
     file_ext = "metacyto_stats.txt"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """Quick test on file headings"""
         if file_prefix.startswith("fcs_files\tcluster_id\tlabel\tfcs_names"):
             header_line = file_prefix.string_io().readline()
@@ -31,5 +31,5 @@ class mSummary(Tabular):
 
     file_ext = "metacyto_summary.txt"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         return file_prefix.startswith("study_id\tantibodies\tfilenames")
diff --git a/lib/galaxy/datatypes/microarrays.py b/lib/galaxy/datatypes/microarrays.py
index 7126febd585..aa8ba733a1a 100644
--- a/lib/galaxy/datatypes/microarrays.py
+++ b/lib/galaxy/datatypes/microarrays.py
@@ -1,4 +1,5 @@
 import logging
+from typing import TYPE_CHECKING
 
 from galaxy.datatypes import data
 from galaxy.datatypes.binary import Cel  # noqa: F401
@@ -10,6 +11,9 @@ from galaxy.datatypes.sniff import (
     get_headers,
 )
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 
@@ -76,7 +80,7 @@ class GenericMicroarrayFile(data.Text):
         name="block_type", default=0, desc="Type of block", readonly=True, visible=True, optional=True, no_value=0
     )
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             if dataset.metadata.block_count == 1:
                 dataset.blurb = f"{dataset.metadata.file_type} {dataset.metadata.version_number}: Format {dataset.metadata.file_format}, 1 block, {dataset.metadata.number_of_optional_header_records} headers and {dataset.metadata.number_of_data_columns} columns"
@@ -87,7 +91,7 @@ class GenericMicroarrayFile(data.Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         return "text/plain"
 
 
@@ -101,7 +105,7 @@ class Gal(GenericMicroarrayFile):
     edam_data = "data_3110"
     file_ext = "gal"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess if the file is a Gal file.
 
@@ -116,11 +120,11 @@ class Gal(GenericMicroarrayFile):
         headers = get_headers(file_prefix, sep="\t", count=3)
         return "ATF" in headers[0][0] and "GenePix ArrayList" in headers[2][0]
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set metadata for Gal file.
         """
-        super().set_meta(dataset, **kwd)
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
         headers = get_headers(dataset.file_name, sep="\t", count=5)
         dataset.metadata.file_format = headers[0][0]
         dataset.metadata.version_number = headers[0][1]
@@ -143,7 +147,7 @@ class Gpr(GenericMicroarrayFile):
     edam_data = "data_3110"
     file_ext = "gpr"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess if the file is a Gpr file.
 
@@ -158,11 +162,11 @@ class Gpr(GenericMicroarrayFile):
         headers = get_headers(file_prefix, sep="\t", count=3)
         return "ATF" in headers[0][0] and "GenePix Results" in headers[2][0]
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set metadata for Gpr file.
         """
-        super().set_meta(dataset, **kwd)
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
         headers = get_headers(dataset.file_name, sep="\t", count=5)
         dataset.metadata.file_format = headers[0][0]
         dataset.metadata.version_number = headers[0][1]
diff --git a/lib/galaxy/datatypes/molecules.py b/lib/galaxy/datatypes/molecules.py
index 1ac69870b7b..fa2d103353e 100644
--- a/lib/galaxy/datatypes/molecules.py
+++ b/lib/galaxy/datatypes/molecules.py
@@ -1,6 +1,12 @@
 import logging
 import os
 import re
+from typing import (
+    Callable,
+    Dict,
+    List,
+    TYPE_CHECKING,
+)
 
 from galaxy.datatypes import metadata
 from galaxy.datatypes.binary import Binary
@@ -23,6 +29,9 @@ from galaxy.util import (
     unicodify,
 )
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 # optional import to enhance metadata
 try:
     from ase import io as ase_io
@@ -63,7 +72,7 @@ class GenericMolFile(Text):
         no_value=0,
     )
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             if dataset.metadata.number_of_molecules == 1:
                 dataset.blurb = "1 molecule"
@@ -74,7 +83,7 @@ class GenericMolFile(Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         return "text/plain"
 
     element_symbols = [
@@ -195,7 +204,7 @@ class GenericMolFile(Text):
 class MOL(GenericMolFile):
     file_ext = "mol"
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the number molecules, in the case of MOL its always one.
         """
@@ -206,7 +215,7 @@ class MOL(GenericMolFile):
 class SDF(GenericMolFile):
     file_ext = "sdf"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess if the file is a SDF2 file.
 
@@ -248,14 +257,14 @@ class SDF(GenericMolFile):
                 break
         return False
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the number of molecules in dataset.
         """
         dataset.metadata.number_of_molecules = count_special_lines(r"^\$\$\$\$$", dataset.file_name)
 
     @classmethod
-    def split(cls, input_datasets, subdir_generator_function, split_params):
+    def split(cls, input_datasets: List, subdir_generator_function: Callable, split_params: Dict) -> None:
         """
         Split the input files by molecule records.
         """
@@ -308,7 +317,7 @@ class SDF(GenericMolFile):
 class MOL2(GenericMolFile):
     file_ext = "mol2"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess if the file is a MOL2 file.
 
@@ -331,14 +340,14 @@ class MOL2(GenericMolFile):
                 break
         return False
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the number of lines of data in dataset.
         """
         dataset.metadata.number_of_molecules = count_special_lines("@<TRIPOS>MOLECULE", dataset.file_name)
 
     @classmethod
-    def split(cls, input_datasets, subdir_generator_function, split_params):
+    def split(cls, input_datasets: List, subdir_generator_function: Callable, split_params: Dict) -> None:
         """
         Split the input files by molecule records.
         """
@@ -399,7 +408,7 @@ class FPS(GenericMolFile):
 
     file_ext = "fps"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess if the file is a FPS file.
 
@@ -417,14 +426,14 @@ class FPS(GenericMolFile):
         else:
             return False
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the number of lines of data in dataset.
         """
         dataset.metadata.number_of_molecules = count_special_lines("^#", dataset.file_name, invert=True)
 
     @classmethod
-    def split(cls, input_datasets, subdir_generator_function, split_params):
+    def split(cls, input_datasets: List, subdir_generator_function: Callable, split_params: Dict) -> None:
         """
         Split the input files by fingerprint records.
         """
@@ -471,7 +480,7 @@ class FPS(GenericMolFile):
             raise
 
     @staticmethod
-    def merge(split_files, output_file):
+    def merge(split_files: List[str], output_file: str) -> None:
         """
         Merging fps files requires merging the header manually.
         We take the header from the first file.
@@ -522,7 +531,7 @@ class OBFS(Binary):
         self.add_composite_file("molecule.mol2", optional=True, is_binary=False, description="Molecule File")
         self.add_composite_file("molecule.cml", optional=True, is_binary=False, description="Molecule File")
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text."""
         if not dataset.dataset.purged:
             dataset.peek = "OpenBabel Fastsearch Index"
@@ -531,22 +540,24 @@ class OBFS(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Create HTML content, used for displaying peek."""
         try:
             return dataset.peek
         except Exception:
             return "OpenBabel Fastsearch Index"
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Returns the mime type of the datatype (pretend it is text for peek)"""
         return "text/plain"
 
-    def merge(split_files, output_file, extra_merge_args):
+    @staticmethod
+    def merge(split_files: List[str], output_file: str) -> None:
         """Merging Fastsearch indices is not supported."""
         raise NotImplementedError("Merging Fastsearch indices is not supported.")
 
-    def split(cls, input_datasets, subdir_generator_function, split_params):
+    @classmethod
+    def split(cls, input_datasets: List, subdir_generator_function: Callable, split_params: Dict) -> None:
         """Splitting Fastsearch indices is not supported."""
         if split_params is None:
             return None
@@ -556,7 +567,7 @@ class OBFS(Binary):
 class DRF(GenericMolFile):
     file_ext = "drf"
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the number of lines of data in dataset.
         """
@@ -570,7 +581,7 @@ class PHAR(GenericMolFile):
 
     file_ext = "phar"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             dataset.blurb = "pharmacophore"
@@ -589,7 +600,7 @@ class PDB(GenericMolFile):
     file_ext = "pdb"
     MetadataElement(name="chain_ids", default=[], desc="Chain IDs", readonly=False, visible=True)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess if the file is a PDB file.
 
@@ -623,7 +634,7 @@ class PDB(GenericMolFile):
         else:
             return False
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Find Chain_IDs for metadata.
         """
@@ -639,7 +650,7 @@ class PDB(GenericMolFile):
             log.error("Error finding chain_ids: %s", unicodify(e))
             raise
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             atom_numbers = count_special_lines("^ATOM", dataset.file_name)
             hetatm_numbers = count_special_lines("^HETATM", dataset.file_name)
@@ -660,7 +671,7 @@ class PDBQT(GenericMolFile):
 
     file_ext = "pdbqt"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess if the file is a PDBQT file.
 
@@ -692,7 +703,7 @@ class PDBQT(GenericMolFile):
         else:
             return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             root_numbers = count_special_lines("^ROOT", dataset.file_name)
             branch_numbers = count_special_lines("^BRANCH", dataset.file_name)
@@ -713,7 +724,7 @@ class PQR(GenericMolFile):
     file_ext = "pqr"
     MetadataElement(name="chain_ids", default=[], desc="Chain IDs", readonly=False, visible=True)
 
-    def get_matcher(self):
+    def get_matcher(self) -> re.Pattern:
         """
         Atom and HETATM line fields are space separated, match group:
           0: Field_name
@@ -750,7 +761,7 @@ class PQR(GenericMolFile):
         )
         return re.compile(pat)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess if the file is a PQR file.
         >>> from galaxy.datatypes.sniff import get_test_fname
@@ -777,7 +788,7 @@ class PQR(GenericMolFile):
         else:
             return False
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Find Optional Chain_IDs for metadata.
         """
@@ -796,7 +807,7 @@ class PQR(GenericMolFile):
             log.error("Error finding chain_ids: %s", unicodify(e))
             raise
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             atom_numbers = count_special_lines("^ATOM", dataset.file_name)
             hetatm_numbers = count_special_lines("^HETATM", dataset.file_name)
@@ -848,7 +859,7 @@ class Cell(GenericMolFile):
         visible=True,
     )
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess if the file is a CASTEP CELL file.
 
@@ -874,7 +885,7 @@ class Cell(GenericMolFile):
                 return True
         return False
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Find Atom IDs for metadata.
         """
@@ -914,7 +925,7 @@ class Cell(GenericMolFile):
                 dataset.metadata.is_periodic = bool(pbc.any())
             dataset.metadata.lattice_parameters = list(lattice_parameters)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             dataset.info = self.get_dataset_info(dataset.metadata)
@@ -997,7 +1008,7 @@ class CIF(GenericMolFile):
         visible=True,
     )
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess if the file is a CIF file.
 
@@ -1033,8 +1044,9 @@ class CIF(GenericMolFile):
                 return file_prefix.search_str("_atom_site_fract_")
             else:  # line has some other content
                 return False
+        return False
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Find Atom IDs for metadata.
         """
@@ -1080,7 +1092,7 @@ class CIF(GenericMolFile):
             dataset.metadata.is_periodic = is_periodic
             dataset.metadata.lattice_parameters = list(lattice_parameters)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             dataset.info = self.get_dataset_info(dataset.metadata)
@@ -1161,7 +1173,7 @@ class XYZ(GenericMolFile):
         visible=True,
     )
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess if the file is a XYZ file.
 
@@ -1191,7 +1203,7 @@ class XYZ(GenericMolFile):
         except (TypeError, ValueError, IndexError):
             return False
 
-    def read_blocks(self, lines):
+    def read_blocks(self, lines: List) -> List:
         """
         Parses and returns a list of dictionaries representing XYZ structure blocks (aka frames).
 
@@ -1231,7 +1243,7 @@ class XYZ(GenericMolFile):
                     raise
         return blocks
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Find Atom IDs for metadata.
         """
@@ -1278,7 +1290,7 @@ class XYZ(GenericMolFile):
             dataset.metadata.is_periodic = is_periodic
             dataset.metadata.lattice_parameters = list(lattice_parameters)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             dataset.info = self.get_dataset_info(dataset.metadata)
@@ -1328,7 +1340,7 @@ class ExtendedXYZ(XYZ):
 
     file_ext = "extxyz"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess if the file is an Extended XYZ file.
 
@@ -1355,7 +1367,7 @@ class ExtendedXYZ(XYZ):
             # insufficient lines
             return False
 
-    def read_blocks(self, lines):
+    def read_blocks(self, lines: List) -> List:
         """
         Parses and returns a list of XYZ structure blocks (aka frames).
 
@@ -1378,10 +1390,10 @@ class ExtendedXYZ(XYZ):
             # extract column properties
             # these have the format 'Properties="<name>:<type>:<number>:..."' in the comment line
             # e.g. Properties="species:S:1:pos:R:3:vel:R:3:select:I:1"
-            properties = re.search(r"Properties=\"?([a-zA-Z0-9:]+)\"?", comment)
-            if properties is None:  # re.search returned None
+            properties_matches = re.search(r"Properties=\"?([a-zA-Z0-9:]+)\"?", comment)
+            if properties_matches is None:  # re.search returned None
                 raise ValueError(f"Could not find column properties in line: {comment}")
-            properties = [s.split(":") for s in re.findall(r"[a-zA-Z]+:[SIRL]:[0-9]+", properties.group(1))]
+            properties = [s.split(":") for s in re.findall(r"[a-zA-Z]+:[SIRL]:[0-9]+", properties_matches.group(1))]
             total_columns = sum(int(s[2]) for s in properties)
 
             for _ in range(n_atoms):
@@ -1433,7 +1445,7 @@ class ExtendedXYZ(XYZ):
             blocks.append({"number_of_atoms": n_atoms, "comment": comment, "atom_data": atoms})
         return blocks
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         super().set_peek(dataset)
         dataset.blurb = "Extended " + dataset.blurb
 
@@ -1441,7 +1453,7 @@ class ExtendedXYZ(XYZ):
 class grd(Text):
     file_ext = "grd"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             dataset.blurb = "grids for docking"
@@ -1453,7 +1465,7 @@ class grd(Text):
 class grdtgz(Binary):
     file_ext = "grd.tgz"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "binary data"
             dataset.blurb = "compressed grids for docking"
@@ -1485,13 +1497,13 @@ class InChI(Tabular):
         no_value=0,
     )
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the number of lines of data in dataset.
         """
         dataset.metadata.number_of_molecules = self.count_data_lines(dataset)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             if dataset.metadata.number_of_molecules == 1:
                 dataset.blurb = "1 molecule"
@@ -1502,7 +1514,7 @@ class InChI(Tabular):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess if the file is a InChI file.
 
@@ -1550,13 +1562,13 @@ class SMILES(Tabular):
         no_value=0,
     )
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the number of lines of data in dataset.
         """
         dataset.metadata.number_of_molecules = self.count_data_lines(dataset)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             if dataset.metadata.number_of_molecules == 1:
                 dataset.blurb = "1 molecule"
@@ -1586,13 +1598,13 @@ class CML(GenericXml):
         no_value=0,
     )
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the number of lines of data in dataset.
         """
         dataset.metadata.number_of_molecules = count_special_lines(r"^\s*<molecule", dataset.file_name)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             if dataset.metadata.number_of_molecules == 1:
                 dataset.blurb = "1 molecule"
@@ -1603,7 +1615,7 @@ class CML(GenericXml):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess if the file is a CML file.
 
@@ -1622,7 +1634,7 @@ class CML(GenericXml):
         return True
 
     @classmethod
-    def split(cls, input_datasets, subdir_generator_function, split_params):
+    def split(cls, input_datasets: List, subdir_generator_function: Callable, split_params: Dict) -> None:
         """
         Split the input files by molecule records.
         """
@@ -1682,7 +1694,7 @@ class CML(GenericXml):
             raise
 
     @staticmethod
-    def merge(split_files, output_file):
+    def merge(split_files: List[str], output_file: str) -> None:
         """
         Merging CML files.
         """
@@ -1725,7 +1737,7 @@ class GRO(GenericMolFile):
 
     file_ext = "gro"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess if the file is a GRO file.
 
@@ -1750,7 +1762,7 @@ class GRO(GenericMolFile):
                 return False
         return True
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             atom_number = int(dataset.peek.split("\n")[1])
diff --git a/lib/galaxy/datatypes/mothur.py b/lib/galaxy/datatypes/mothur.py
index 14a0f0b8f0b..a82771dcd8f 100644
--- a/lib/galaxy/datatypes/mothur.py
+++ b/lib/galaxy/datatypes/mothur.py
@@ -3,6 +3,11 @@ Mothur Metagenomics Datatypes
 """
 import logging
 import re
+from typing import (
+    List,
+    Optional,
+    TYPE_CHECKING,
+)
 
 from galaxy.datatypes.data import Text
 from galaxy.datatypes.metadata import MetadataElement
@@ -15,6 +20,9 @@ from galaxy.datatypes.sniff import (
 from galaxy.datatypes.tabular import Tabular
 from galaxy.util import unicodify
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 
@@ -28,7 +36,7 @@ class Otu(Text):
     def __init__(self, **kwd):
         super().__init__(**kwd)
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set metadata for Otu files.
 
@@ -77,7 +85,7 @@ class Otu(Text):
             dataset.metadata.labels = sorted(label_names)
             dataset.metadata.otulabels = sorted(otulabel_names)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is otu (operational taxonomic unit) format
 
@@ -118,10 +126,10 @@ class Sabund(Otu):
         """
         super().__init__(**kwd)
 
-    def init_meta(self, dataset, copy_from=None):
+    def init_meta(self, dataset: "DatasetInstance", copy_from: Optional["DatasetInstance"] = None) -> None:
         super().init_meta(dataset, copy_from=copy_from)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is otu (operational taxonomic unit) format
         label<TAB>count[<TAB>value(1..n)]
@@ -162,10 +170,10 @@ class GroupAbund(Otu):
     def __init__(self, **kwd):
         super().__init__(**kwd)
 
-    def init_meta(self, dataset, copy_from=None):
+    def init_meta(self, dataset: "DatasetInstance", copy_from: Optional["DatasetInstance"] = None) -> None:
         super().init_meta(dataset, copy_from=copy_from)
 
-    def set_meta(self, dataset, overwrite=True, skip=1, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, skip: Optional[int] = 1, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
 
         # See if file starts with header line
@@ -195,7 +203,7 @@ class GroupAbund(Otu):
             dataset.metadata.groups = sorted(group_names)
             dataset.metadata.skip = skip
 
-    def sniff_prefix(self, file_prefix: FilePrefix, vals_are_int=False):
+    def sniff_prefix(self, file_prefix: FilePrefix, vals_are_int=False) -> bool:
         """
         Determines whether the file is a otu (operational taxonomic unit)
         Shared format
@@ -243,7 +251,7 @@ class SecondaryStructureMap(Tabular):
         super().__init__(**kwd)
         self.column_names = ["Map"]
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is a secondary structure map format
         A single column with an integer value which indicates the row that this
@@ -289,7 +297,7 @@ class AlignCheck(Tabular):
         self.column_types = ["str", "int", "int", "int", "int", "int", "int", "int"]
         self.comment_lines = 1
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
 
         dataset.metadata.column_names = self.column_names
@@ -343,10 +351,10 @@ class DistanceMatrix(Text):
         no_value="?",
     )
 
-    def init_meta(self, dataset, copy_from=None):
+    def init_meta(self, dataset: "DatasetInstance", copy_from: Optional["DatasetInstance"] = None) -> None:
         super().init_meta(dataset, copy_from=copy_from)
 
-    def set_meta(self, dataset, overwrite=True, skip=0, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, skip: Optional[int] = 0, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, skip=skip, **kwd)
 
         headers = iter_headers(dataset.file_name, sep="\t")
@@ -368,10 +376,10 @@ class LowerTriangleDistanceMatrix(DistanceMatrix):
         """Initialize secondary structure map datatype"""
         super().__init__(**kwd)
 
-    def init_meta(self, dataset, copy_from=None):
+    def init_meta(self, dataset: "DatasetInstance", copy_from: Optional["DatasetInstance"] = None) -> None:
         super().init_meta(dataset, copy_from=copy_from)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is a lower-triangle distance matrix (phylip) format
         The first line has the number of sequences in the matrix.
@@ -433,10 +441,10 @@ class SquareDistanceMatrix(DistanceMatrix):
     def __init__(self, **kwd):
         super().__init__(**kwd)
 
-    def init_meta(self, dataset, copy_from=None):
+    def init_meta(self, dataset: "DatasetInstance", copy_from: Optional["DatasetInstance"] = None) -> None:
         super().init_meta(dataset, copy_from=copy_from)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is a square distance matrix (Column-formatted distance matrix) format
         The first line has the number of sequences in the matrix.
@@ -499,10 +507,10 @@ class PairwiseDistanceMatrix(DistanceMatrix, Tabular):
         self.column_names = ["Sequence", "Sequence", "Distance"]
         self.column_types = ["str", "str", "float"]
 
-    def set_meta(self, dataset, overwrite=True, skip=None, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, skip: Optional[int] = None, **kwd) -> None:
         super().set_meta(dataset, overwrite=overwrite, skip=skip, **kwd)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is a pairwise distance matrix (Column-formatted distance matrix) format
         The first and second columns have the sequence names and the third column is the distance between those sequences.
@@ -587,8 +595,15 @@ class Group(Tabular):
         self.column_names = ["name", "group"]
         self.columns = 2
 
-    def set_meta(self, dataset, overwrite=True, skip=None, max_data_lines=None, **kwd):
-        super().set_meta(dataset, overwrite, skip, max_data_lines)
+    def set_meta(
+        self,
+        dataset: "DatasetInstance",
+        overwrite: bool = True,
+        skip: Optional[int] = None,
+        max_data_lines: Optional[int] = None,
+        **kwd,
+    ) -> None:
+        super().set_meta(dataset, overwrite=overwrite, skip=skip, max_data_lines=max_data_lines, **kwd)
 
         group_names = set()
         headers = iter_headers(dataset.file_name, sep="\t", count=-1)
@@ -612,7 +627,7 @@ class AccNos(Tabular):
 class Oligos(Text):
     file_ext = "mothur.oligos"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         http://www.mothur.org/wiki/Oligos_File
         Determines whether the file is a otu (operational taxonomic unit) format
@@ -653,7 +668,7 @@ class Frequency(Tabular):
         self.column_names = ["position", "frequency"]
         self.column_types = ["int", "float"]
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is a frequency tabular format for chimera analysis
 
@@ -732,7 +747,7 @@ class Quantile(Tabular):
         self.column_names = ["num", "ten", "twentyfive", "fifty", "seventyfive", "ninetyfive", "ninetynine"]
         self.column_types = ["int", "float", "float", "float", "float", "float", "float"]
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is a quantiles tabular format for chimera analysis
 
@@ -778,7 +793,7 @@ class Quantile(Tabular):
 class LaneMask(Text):
     file_ext = "mothur.filter"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is a lane mask filter:  1 line consisting of zeros and ones.
 
@@ -828,7 +843,14 @@ class CountTable(Tabular):
         super().__init__(**kwd)
         self.column_names = ["name", "total"]
 
-    def set_meta(self, dataset, overwrite=True, skip=1, max_data_lines=None, **kwd):
+    def set_meta(
+        self,
+        dataset: "DatasetInstance",
+        overwrite: bool = True,
+        skip: Optional[int] = 1,
+        max_data_lines: Optional[int] = None,
+        **kwd,
+    ) -> None:
         super().set_meta(dataset, overwrite=overwrite, **kwd)
 
         headers = get_headers(dataset.file_name, sep="\t", count=1)
@@ -852,7 +874,7 @@ class RefTaxonomy(Tabular):
         super().__init__(**kwd)
         self.column_names = ["name", "taxonomy"]
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is a Reference Taxonomy
 
@@ -939,7 +961,7 @@ class Axes(Tabular):
         """Initialize axes datatype"""
         super().__init__(**kwd)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is an axes format
         The first line may have column headings.
@@ -1033,8 +1055,15 @@ class SffFlow(Tabular):
     def __init__(self, **kwd):
         super().__init__(**kwd)
 
-    def set_meta(self, dataset, overwrite=True, skip=1, max_data_lines=None, **kwd):
-        super().set_meta(dataset, overwrite, 1, max_data_lines)
+    def set_meta(
+        self,
+        dataset: "DatasetInstance",
+        overwrite: bool = True,
+        skip: Optional[int] = 1,
+        max_data_lines: Optional[int] = None,
+        **kwd,
+    ) -> None:
+        super().set_meta(dataset, overwrite=overwrite, skip=1, max_data_lines=max_data_lines, **kwd)
 
         headers = get_headers(dataset.file_name, sep="\t", count=1)
         try:
@@ -1043,10 +1072,9 @@ class SffFlow(Tabular):
         except Exception as e:
             log.warning(f"SffFlow set_meta {e}")
 
-    def make_html_table(self, dataset, skipchars=None):
+    def make_html_table(self, dataset: "DatasetInstance", skipchars: Optional[List] = None, **kwargs) -> str:
         """Create HTML table, used for displaying peek"""
-        if skipchars is None:
-            skipchars = []
+        skipchars = skipchars or []
         try:
             out = '<table cellspacing="0" cellpadding="3">'
 
diff --git a/lib/galaxy/datatypes/msa.py b/lib/galaxy/datatypes/msa.py
index c5c8feab069..6dc5f3e5c03 100644
--- a/lib/galaxy/datatypes/msa.py
+++ b/lib/galaxy/datatypes/msa.py
@@ -2,6 +2,12 @@ import abc
 import logging
 import os
 import re
+from typing import (
+    Callable,
+    Dict,
+    List,
+    TYPE_CHECKING,
+)
 
 from galaxy.datatypes.binary import Binary
 from galaxy.datatypes.data import (
@@ -19,6 +25,9 @@ from galaxy.util import (
     unicodify,
 )
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 STOCKHOLM_SEARCH_PATTERN = re.compile(r"#\s+STOCKHOLM\s+1\.0")
@@ -48,7 +57,7 @@ class InfernalCM(Text):
         no_value=0,
     )
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             if dataset.metadata.number_of_models == 1:
@@ -60,7 +69,7 @@ class InfernalCM(Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disc"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         >>> from galaxy.datatypes.sniff import get_test_fname
         >>> fname = get_test_fname( 'infernal_model.cm' )
@@ -72,7 +81,7 @@ class InfernalCM(Text):
         """
         return file_prefix.startswith("INFERNAL")
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the number of models and the version of CM file in dataset.
         """
@@ -88,7 +97,7 @@ class Hmmer(Text):
     edam_data = "data_1364"
     edam_format = "format_1370"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             dataset.blurb = "HMMER Database"
@@ -96,14 +105,14 @@ class Hmmer(Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disc"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
             return f"HMMER database ({nice_size(dataset.get_size())})"
 
     @abc.abstractmethod
-    def sniff_prefix(self, filename):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         raise NotImplementedError
 
 
@@ -111,7 +120,7 @@ class Hmmer2(Hmmer):
     edam_format = "format_3328"
     file_ext = "hmm2"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """HMMER2 files start with HMMER2.0"""
         return file_prefix.startswith("HMMER2.0")
 
@@ -120,7 +129,7 @@ class Hmmer3(Hmmer):
     edam_format = "format_3329"
     file_ext = "hmm3"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """HMMER3 files start with HMMER3/f"""
         return file_prefix.startswith("HMMER3/f")
 
@@ -131,7 +140,7 @@ class HmmerPress(Binary):
     file_ext = "hmmpress"
     composite_type = "basic"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text."""
         if not dataset.dataset.purged:
             dataset.peek = "HMMER Binary database"
@@ -140,7 +149,7 @@ class HmmerPress(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Create HTML content, used for displaying peek."""
         try:
             return dataset.peek
@@ -175,7 +184,7 @@ class Stockholm_1_0(Text):
         no_value=0,
     )
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             if dataset.metadata.number_of_models == 1:
                 dataset.blurb = "1 alignment"
@@ -186,10 +195,10 @@ class Stockholm_1_0(Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disc"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         return file_prefix.search(STOCKHOLM_SEARCH_PATTERN)
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
 
         Set the number of models in dataset.
@@ -199,7 +208,7 @@ class Stockholm_1_0(Text):
         )
 
     @classmethod
-    def split(cls, input_datasets, subdir_generator_function, split_params):
+    def split(cls, input_datasets: List, subdir_generator_function: Callable, split_params: Dict) -> None:
         """
 
         Split the input files by model records.
@@ -266,7 +275,7 @@ class MauveXmfa(Text):
         no_value=0,
     )
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             if dataset.metadata.number_of_models == 1:
                 dataset.blurb = "1 alignment"
@@ -277,10 +286,10 @@ class MauveXmfa(Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disc"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         return file_prefix.startswith("#FormatVersion Mauve1")
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         dataset.metadata.number_of_models = generic_util.count_special_lines(
             "^#Sequence([[:digit:]]+)Entry", dataset.file_name
         )
diff --git a/lib/galaxy/datatypes/neo4j.py b/lib/galaxy/datatypes/neo4j.py
index 041021a2972..4c53dccb56a 100644
--- a/lib/galaxy/datatypes/neo4j.py
+++ b/lib/galaxy/datatypes/neo4j.py
@@ -2,11 +2,18 @@
 Neo4j Composite Dataset
 """
 import logging
+from typing import TYPE_CHECKING
 
-from galaxy.datatypes.data import Data
+from galaxy.datatypes.data import (
+    Data,
+    GeneratePrimaryFileDataset,
+)
 from galaxy.datatypes.images import Html
 from galaxy.datatypes.metadata import MetadataElement
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 gal_Log = logging.getLogger(__name__)
 verbose = True
 
@@ -18,7 +25,7 @@ class Neo4j(Html):
     stored in extra files path
     """
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         """
         This is called only at upload to write the html file
         cannot rename the datasets here - they come with the default unfortunately
@@ -37,11 +44,11 @@ class Neo4j(Html):
         rval.append("</ul></html>")
         return "\n".join(rval)
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Returns the mime type of the datatype"""
         return "text/html"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = "Neo4j database (multiple files)"
@@ -50,7 +57,7 @@ class Neo4j(Html):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Create HTML content, used for displaying peek."""
         try:
             return dataset.peek
diff --git a/lib/galaxy/datatypes/ngsindex.py b/lib/galaxy/datatypes/ngsindex.py
index d065005ce29..198fb994b0f 100644
--- a/lib/galaxy/datatypes/ngsindex.py
+++ b/lib/galaxy/datatypes/ngsindex.py
@@ -3,10 +3,15 @@ NGS indexes
 """
 import logging
 import os
+from typing import TYPE_CHECKING
 
+from galaxy.datatypes.data import GeneratePrimaryFileDataset
 from .metadata import MetadataElement
 from .text import Html
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 
@@ -33,14 +38,14 @@ class BowtieIndex(Html):
 
     composite_type = "auto_primary_file"
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         """
         This is called only at upload to write the html file
         cannot rename the datasets here - they come with the default unfortunately
         """
         return "<html><head></head><body>AutoGenerated Primary File for Composite Dataset</body></html>"
 
-    def regenerate_primary_file(self, dataset):
+    def regenerate_primary_file(self, dataset: "DatasetInstance") -> None:
         """
         cannot do this until we are setting metadata
         """
@@ -57,7 +62,7 @@ class BowtieIndex(Html):
             f.write("\n".join(rval))
             f.write("\n")
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = f"Bowtie index file ({dataset.metadata.sequence_space})"
             dataset.blurb = f"{dataset.metadata.sequence_space} space"
@@ -65,7 +70,7 @@ class BowtieIndex(Html):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
diff --git a/lib/galaxy/datatypes/phylip.py b/lib/galaxy/datatypes/phylip.py
index 27b8799a947..551043080cf 100644
--- a/lib/galaxy/datatypes/phylip.py
+++ b/lib/galaxy/datatypes/phylip.py
@@ -7,6 +7,8 @@ Created on January. 05, 2018
 @githuborganization: C3BI
 Phylip datatype sniffer
 """
+from typing import TYPE_CHECKING
+
 from galaxy import util
 from galaxy.datatypes.data import (
     get_file_peek,
@@ -19,6 +21,11 @@ from galaxy.datatypes.sniff import (
 from galaxy.util import nice_size
 from .metadata import MetadataElement
 
+if TYPE_CHECKING:
+    from io import StringIO
+
+    from galaxy.model import DatasetInstance
+
 
 @build_sniff_from_prefix
 class Phylip(Text):
@@ -32,7 +39,7 @@ class Phylip(Text):
         name="sequences", default=0, desc="Number of sequences", readonly=True, visible=False, optional=True, no_value=0
     )
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the number of sequences and the number of data lines in dataset.
         """
@@ -42,7 +49,7 @@ class Phylip(Text):
         except Exception:
             raise Exception("Header does not correspond to PHYLIP header.")
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             if dataset.metadata.sequences:
@@ -53,7 +60,7 @@ class Phylip(Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff_strict_interleaved(self, nb_seq, seq_length, alignment_prefix):
+    def sniff_strict_interleaved(self, nb_seq: int, seq_length: int, alignment_prefix: "StringIO") -> bool:
         found_seq_length = None
         for _ in range(nb_seq):
             line = alignment_prefix.readline()
@@ -82,10 +89,10 @@ class Phylip(Text):
         # There may be more lines with the remaining parts of the sequences
         return True
 
-    def sniff_strict_sequential(self, nb_seq, seq_length, alignment_prefix):
+    def sniff_strict_sequential(self, nb_seq: int, seq_length: int, alignment_prefix: "StringIO") -> bool:
         raise NotImplementedError
 
-    def sniff_relaxed_interleaved(self, nb_seq, seq_length, alignment_prefix):
+    def sniff_relaxed_interleaved(self, nb_seq: int, seq_length: int, alignment_prefix: "StringIO") -> bool:
         found_seq_length = None
         for _ in range(nb_seq):
             line = alignment_prefix.readline()
@@ -117,7 +124,7 @@ class Phylip(Text):
         # There may be more lines with the remaining parts of the sequences
         return True
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         All Phylip files starts with the number of sequences so we can use this
         to count the following number of sequences in the first 'stack'
diff --git a/lib/galaxy/datatypes/plant_tribes.py b/lib/galaxy/datatypes/plant_tribes.py
index e286edf7aee..a0528fe0e3d 100644
--- a/lib/galaxy/datatypes/plant_tribes.py
+++ b/lib/galaxy/datatypes/plant_tribes.py
@@ -1,5 +1,6 @@
 import logging
 import re
+from typing import TYPE_CHECKING
 
 from galaxy.datatypes.data import (
     get_file_peek,
@@ -14,6 +15,9 @@ from galaxy.datatypes.sniff import (
 from galaxy.datatypes.tabular import Tabular
 from galaxy.util import nice_size
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 
@@ -21,13 +25,13 @@ log = logging.getLogger(__name__)
 class Smat(Text):
     file_ext = "smat"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
             return f"ESTScan scores matrices ({nice_size(dataset.get_size())})"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             dataset.blurb = "ESTScan scores matrices"
@@ -35,7 +39,7 @@ class Smat(Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disc"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         The use of ESTScan implies the creation of scores matrices which
         reflect the codons preferences in the studied organisms.  The
@@ -93,18 +97,18 @@ class PlantTribesKsComponents(Tabular):
         no_value=0,
     )
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
             return f"Significant components in the Ks distribution ({nice_size(dataset.get_size())})"
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the number of significant components in the Ks distribution.
         The dataset will always be on the order of less than 10 lines.
         """
-        super().set_meta(dataset, **kwd)
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
         significant_components = []
         with open(dataset.file_name) as fh:
             for i, line in enumerate(fh):
@@ -121,7 +125,7 @@ class PlantTribesKsComponents(Tabular):
         if len(significant_components) > 0:
             dataset.metadata.number_comp = max(significant_components)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             if dataset.metadata.number_comp == 1:
@@ -132,7 +136,7 @@ class PlantTribesKsComponents(Tabular):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """
         >>> from galaxy.datatypes.sniff import get_test_fname
         >>> fname = get_test_fname('test_tab.bed')
diff --git a/lib/galaxy/datatypes/proteomics.py b/lib/galaxy/datatypes/proteomics.py
index a9878667abd..7bda20361aa 100644
--- a/lib/galaxy/datatypes/proteomics.py
+++ b/lib/galaxy/datatypes/proteomics.py
@@ -3,10 +3,19 @@ Proteomics Datatypes
 """
 import logging
 import re
+from typing import (
+    IO,
+    List,
+    Optional,
+    TYPE_CHECKING,
+)
 
 from galaxy.datatypes import data
 from galaxy.datatypes.binary import Binary
-from galaxy.datatypes.data import Text
+from galaxy.datatypes.data import (
+    GeneratePrimaryFileDataset,
+    Text,
+)
 from galaxy.datatypes.sequence import Sequence
 from galaxy.datatypes.sniff import (
     build_sniff_from_prefix,
@@ -19,6 +28,9 @@ from galaxy.datatypes.tabular import (
 from galaxy.datatypes.xml import GenericXml
 from galaxy.util import nice_size
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 
@@ -46,7 +58,7 @@ class Wiff(Binary):
             is_binary=True,
         )
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         rval = ["<html><head><title>Wiff Composite Dataset </title></head><p/>"]
         rval.append("<div>This composite dataset is composed of the following files:<p/><ul>")
         for composite_name, composite_file in self.get_composite_files(dataset=dataset).items():
@@ -64,6 +76,48 @@ class Wiff(Binary):
         return "\n".join(rval)
 
 
+class Wiff2(Binary):
+    """Class for wiff2 files."""
+
+    edam_data = "data_2536"
+    edam_format = "format_3710"
+    file_ext = "wiff2"
+    composite_type = "auto_primary_file"
+
+    def __init__(self, **kwd):
+        super().__init__(**kwd)
+
+        self.add_composite_file(
+            "wiff2",
+            description="AB SCIEX files in .wiff2 format. This can contain all needed information or only metadata.",
+            is_binary=True,
+        )
+
+        self.add_composite_file(
+            "wiff_scan",
+            description="AB SCIEX spectra file (wiff.scan), if the corresponding .wiff2 file only contains metadata.",
+            optional="True",
+            is_binary=True,
+        )
+
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
+        rval = ["<html><head><title>Wiff2 Composite Dataset </title></head><p/>"]
+        rval.append("<div>This composite dataset is composed of the following files:<p/><ul>")
+        for composite_name, composite_file in self.get_composite_files(dataset=dataset).items():
+            fn = composite_name
+            opt_text = ""
+            if composite_file.optional:
+                opt_text = " (optional)"
+            if composite_file.get("description"):
+                rval.append(
+                    f"<li><a href=\"{fn}\" type=\"text/plain\">{fn} ({composite_file.get('description')})</a>{opt_text}</li>"
+                )
+            else:
+                rval.append(f'<li><a href="{fn}" type="text/plain">{fn}</a>{opt_text}</li>')
+        rval.append("</ul></div></html>")
+        return "\n".join(rval)
+
+
 @build_sniff_from_prefix
 class MzTab(Text):
     """
@@ -94,7 +148,7 @@ class MzTab(Text):
     def __init__(self, **kwd):
         super().__init__(**kwd)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -103,7 +157,7 @@ class MzTab(Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """Determines whether the file is the correct type."""
         has_version = False
         found_man_mtd = set()
@@ -119,7 +173,7 @@ class MzTab(Text):
                     mandatory_field = self._man_mtd[columns[1]]
                     if mandatory_field is None or columns[2].lower() in mandatory_field:
                         found_man_mtd.add(columns[1])
-            elif not columns[0] in self._sections:
+            elif columns[0] not in self._sections:
                 return False
         return has_version and found_man_mtd == set(self._man_mtd.keys())
 
@@ -145,7 +199,7 @@ class MzTab2(MzTab):
     def __init__(self, **kwd):
         super().__init__(**kwd)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -190,11 +244,11 @@ class Kroenik(Tabular):
             "Modifications",
         ]
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Returns formated html of peek"""
         return self.make_html_table(dataset, column_names=self.column_names)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         fh = file_prefix.string_io()
         line = [_.strip() for _ in fh.readline().split("\t")]
         if line != self.column_names:
@@ -229,11 +283,11 @@ class PepList(Tabular):
         super().__init__(**kwd)
         self.column_names = ["m/z", "rt(min)", "snr", "charge", "intensity"]
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Returns formated html of peek"""
         return self.make_html_table(dataset, column_names=self.column_names)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         fh = file_prefix.string_io()
         line = [_.strip() for _ in fh.readline().split("\t")]
         if line == self.column_names:
@@ -266,11 +320,11 @@ class PSMS(Tabular):
         super().__init__(**kwd)
         self.column_names = ["PSMId", "score", "q-value", "posterior_error_prob", "peptide", "proteinIds"]
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Returns formated html of peek"""
         return self.make_html_table(dataset, column_names=self.column_names)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         fh = file_prefix.string_io()
         line = [_.strip() for _ in fh.readline().split("\t")]
         if line == self.column_names:
@@ -287,7 +341,7 @@ class PEFF(Sequence):
 
     file_ext = "peff"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         >>> from galaxy.datatypes.sniff import get_test_fname
         >>> fname = get_test_fname( 'test.peff' )
@@ -326,7 +380,7 @@ class PepXmlReport(Tabular):
             "Interprophet Probability",
         ]
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Returns formated html of peek"""
         return self.make_html_table(dataset, column_names=self.column_names)
 
@@ -367,7 +421,7 @@ class ProtXmlReport(Tabular):
             "Is Evidence?",
         ]
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Returns formated html of peek"""
         return self.make_html_table(dataset, column_names=self.column_names)
 
@@ -382,9 +436,9 @@ class Dta(TabularData):
     file_ext = "dta"
     comment_lines = 0
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         column_types = []
-        data_row = []
+        data_row: List = []
         data_lines = 0
         if dataset.has_data():
             with open(dataset.file_name) as dtafile:
@@ -430,7 +484,7 @@ class Dta2d(TabularData):
     file_ext = "dta2d"
     comment_lines = 0
 
-    def _parse_header(self, line):
+    def _parse_header(self, line: List) -> Optional[List]:
         if len(line) != 3 or len(line[0]) < 3 or not line[0].startswith("#"):
             return None
         line[0] = line[0].lstrip("#")
@@ -439,14 +493,14 @@ class Dta2d(TabularData):
             return None
         return line
 
-    def _parse_delimiter(self, line):
+    def _parse_delimiter(self, line: str) -> Optional[str]:
         if len(line.split(" ")) == 3:
             return " "
         elif len(line.split("\t")) == 3:
             return "\t"
         return None
 
-    def _parse_dataline(self, line):
+    def _parse_dataline(self, line: List) -> bool:
         try:
             line = [float(_) for _ in line]
         except ValueError:
@@ -455,7 +509,7 @@ class Dta2d(TabularData):
             return False
         return True
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         data_lines = 0
         delim = None
         if dataset.has_data():
@@ -479,7 +533,7 @@ class Dta2d(TabularData):
             dataset.metadata.data_lines -= 1
             dataset.metadata.column_names = ["SEC", "MZ", "INT"]
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         sep = None
         header = None
         for idx, line in enumerate(file_prefix.line_iterator()):
@@ -532,7 +586,7 @@ class Edta(TabularData):
     file_ext = "edta"
     comment_lines = 0
 
-    def _parse_delimiter(self, line):
+    def _parse_delimiter(self, line: str) -> Optional[str]:
         if len(line.split(" ")) >= 3:
             return " "
         elif len(line.split("\t")) >= 3:
@@ -541,7 +595,7 @@ class Edta(TabularData):
             return "\t"
         return None
 
-    def _parse_type(self, line):
+    def _parse_type(self, line: List) -> Optional[int]:
         """
         parse the type from the header line
         types 1-3 as in the class docs, 0: type 1 wo/wrong header
@@ -561,7 +615,7 @@ class Edta(TabularData):
         else:
             return 3
 
-    def _parse_dataline(self, line, tpe):
+    def _parse_dataline(self, line: List, tpe: Optional[int]) -> bool:
         if tpe == 2 or tpe == 3:
             idx = 4
         else:
@@ -574,7 +628,7 @@ class Edta(TabularData):
             return False
         return True
 
-    def _clean_header(self, line):
+    def _clean_header(self, line: List) -> List:
         for idx, el in enumerate(line):
             el = el.lower()
             if el.startswith("rt"):
@@ -591,7 +645,7 @@ class Edta(TabularData):
                 line[idx] += str(idx // 4)
         return line
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         data_lines = 0
         delim = None
         tpe = None
@@ -623,7 +677,7 @@ class Edta(TabularData):
             dataset.metadata.comment_lines += 1
             dataset.metadata.data_lines -= 1
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         sep = None
         tpe = None
         for idx, line in enumerate(file_prefix.line_iterator()):
@@ -655,7 +709,7 @@ class ProteomicsXml(GenericXml):
     edam_format = "format_2032"
     root: str
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """Determines whether the file is the correct XML type."""
         for line in file_prefix.line_iterator():
             line = line.strip()
@@ -665,11 +719,11 @@ class ProteomicsXml(GenericXml):
         pattern = r"<(\w*:)?%s" % self.root
         return re.search(pattern, line) is not None
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
-            dataset.blurb = self.blurb
+            dataset.blurb = "ProteomicsXML data"
         else:
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
@@ -834,7 +888,7 @@ class Mgf(Text):
     edam_format = "format_3651"
     file_ext = "mgf"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -843,7 +897,7 @@ class Mgf(Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         mgf_begin_ions = "BEGIN IONS"
         max_lines = 100
 
@@ -854,6 +908,7 @@ class Mgf(Text):
                     return True
                 if i > max_lines:
                     return False
+        return False
 
 
 class MascotDat(Text):
@@ -863,7 +918,7 @@ class MascotDat(Text):
     edam_format = "format_3713"
     file_ext = "mascotdat"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -872,7 +927,7 @@ class MascotDat(Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         mime_version = "MIME-Version: 1.0 (Generated by Mascot version 1.0)"
         max_lines = 10
 
@@ -883,6 +938,7 @@ class MascotDat(Text):
                     return True
                 if i > max_lines:
                     return False
+        return False
 
 
 class ThermoRAW(Binary):
@@ -892,7 +948,7 @@ class ThermoRAW(Binary):
     edam_format = "format_3712"
     file_ext = "thermo.raw"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         # Thermo Finnigan RAW format is proprietary and hence not well documented.
         # Files start with 2 bytes that seem to differ followed by F\0i\0n\0n\0i\0g\0a\0n
         # This combination represents 17 bytes, but to play safe we read 20 bytes from
@@ -906,7 +962,7 @@ class ThermoRAW(Binary):
         except Exception:
             return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Thermo Finnigan RAW file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -914,7 +970,7 @@ class ThermoRAW(Binary):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -928,11 +984,11 @@ class Msp(Text):
     file_ext = "msp"
 
     @staticmethod
-    def next_line_starts_with(contents, prefix):
+    def next_line_starts_with(contents: IO, prefix: str) -> bool:
         next_line = contents.readline()
         return next_line is not None and next_line.startswith(prefix)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """Determines whether the file is a NIST MSP output file."""
         begin_contents = file_prefix.contents_header
         if "\n" not in begin_contents:
@@ -948,7 +1004,7 @@ class SPLibNoIndex(Text):
 
     file_ext = "splib_noindex"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -973,7 +1029,7 @@ class SPLib(Msp):
         self.add_composite_file("library.spidx", description="Spectrum index", is_binary=False)
         self.add_composite_file("library.pepidx", description="Peptide index", is_binary=False)
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         rval = ["<html><head><title>Spectral Library Composite Dataset </title></head><p/>"]
         rval.append("<div>This composite dataset is composed of the following files:<p/><ul>")
         for composite_name, composite_file in self.get_composite_files(dataset=dataset).items():
@@ -990,7 +1046,7 @@ class SPLib(Msp):
         rval.append("</ul></div></html>")
         return "\n".join(rval)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -999,7 +1055,7 @@ class SPLib(Msp):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """Determines whether the file is a SpectraST generated file."""
         contents = file_prefix.string_io()
         return Msp.next_line_starts_with(contents, "Name:") and Msp.next_line_starts_with(contents, "LibID:")
@@ -1009,7 +1065,7 @@ class SPLib(Msp):
 class Ms2(Text):
     file_ext = "ms2"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """Determines whether the file is a valid ms2 file."""
         header_lines = []
         for line in file_prefix.line_iterator():
@@ -1062,7 +1118,7 @@ class ImzML(Binary):
 
         self.add_composite_file("ibd", description="The mass spectral data component.", is_binary=True)
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         rval = ["<html><head><title>imzML Composite Dataset </title></head><p/>"]
         rval.append("<div>This composite dataset is composed of the following files:<p/><ul>")
         for composite_name, composite_file in self.get_composite_files(dataset=dataset).items():
diff --git a/lib/galaxy/datatypes/qiime2.py b/lib/galaxy/datatypes/qiime2.py
index c49f8adf513..4a2ed5cc9dc 100644
--- a/lib/galaxy/datatypes/qiime2.py
+++ b/lib/galaxy/datatypes/qiime2.py
@@ -3,14 +3,26 @@ import html
 import io
 import uuid as _uuid
 import zipfile
+from typing import (
+    Dict,
+    List,
+    Optional,
+    TYPE_CHECKING,
+)
 
 import yaml
 
 from galaxy.datatypes.binary import CompressedZipArchive
 from galaxy.datatypes.metadata import MetadataElement
-from galaxy.datatypes.sniff import build_sniff_from_prefix
+from galaxy.datatypes.sniff import (
+    build_sniff_from_prefix,
+    FilePrefix,
+)
 from galaxy.datatypes.tabular import Tabular
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 
 class _QIIME2ResultBase(CompressedZipArchive):
     """Base class for QIIME2Artifact and QIIME2Visualization"""
@@ -21,7 +33,7 @@ class _QIIME2ResultBase(CompressedZipArchive):
     MetadataElement(name="format", optional=True, no_value="", readonly=True)
     MetadataElement(name="version", readonly=True)
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         metadata = _get_metadata_from_archive(dataset.file_name)
         for key, value in metadata.items():
             if value:
@@ -29,7 +41,7 @@ class _QIIME2ResultBase(CompressedZipArchive):
 
         dataset.metadata.semantic_type_simple = _strip_properties(dataset.metadata.semantic_type)
 
-    def set_peek(self, dataset, is_multi_byte=False):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if dataset.metadata.semantic_type == "Visualization":
             dataset.blurb = "QIIME 2 Visualization"
         else:
@@ -37,7 +49,7 @@ class _QIIME2ResultBase(CompressedZipArchive):
 
         dataset.peek = "\n".join(map(": ".join, self._peek(dataset)))
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         def make_row(item):
             return "<tr><th>%s</th><td>%s</td></td>" % tuple(html.escape(x) for x in item)
 
@@ -47,7 +59,7 @@ class _QIIME2ResultBase(CompressedZipArchive):
 
         return "".join(table)
 
-    def _peek(self, dataset, simple=False):
+    def _peek(self, dataset: "DatasetInstance", simple: bool = False) -> List:
         peek = [("Type", dataset.metadata.semantic_type), ("UUID", dataset.metadata.uuid)]
         if not simple:
             if dataset.metadata.semantic_type != "Visualization":
@@ -55,30 +67,30 @@ class _QIIME2ResultBase(CompressedZipArchive):
             peek.append(("Version", dataset.metadata.version))
         return peek
 
-    def _sniff(self, filename):
+    def _sniff(self, filename: str) -> Optional[Dict]:
         """Helper method for use in inherited datatypes"""
         try:
             if not zipfile.is_zipfile(filename):
                 raise Exception()
             return _get_metadata_from_archive(filename)
         except Exception:
-            return False
+            return None
 
 
 class QIIME2Artifact(_QIIME2ResultBase):
     file_ext = "qza"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         metadata = self._sniff(filename)
-        return metadata and metadata["semantic_type"] != "Visualization"
+        return bool(metadata) and metadata["semantic_type"] != "Visualization"  # type: ignore[index]
 
 
 class QIIME2Visualization(_QIIME2ResultBase):
     file_ext = "qzv"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         metadata = self._sniff(filename)
-        return metadata and metadata["semantic_type"] == "Visualization"
+        return bool(metadata) and metadata["semantic_type"] == "Visualization"  # type: ignore[index]
 
 
 @build_sniff_from_prefix
@@ -100,17 +112,15 @@ class QIIME2Metadata(Tabular):
     _TYPES_DIRECTIVE = "#q2:types"
     _search_lines = 2
 
-    def get_column_names(self, first_line=None):
-        if first_line is None:
-            return None
+    def get_column_names(self, first_line: str) -> Optional[List[str]]:
         return first_line.strip().split("\t")
 
-    def set_meta(self, dataset, **kwargs):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Let Galaxy's Tabular format handle most of this. We will just jump
         in at the last minute to (potentially) override some column types.
         """
-        super().set_meta(dataset, **kwargs)
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
 
         if dataset.has_data():
             with open(dataset.file_name) as dataset_fh:
@@ -139,7 +149,7 @@ class QIIME2Metadata(Tabular):
                     if q2_type == "categorical" and col_type in ("float", "int", "list"):
                         dataset.metadata.column_types[idx] = "str"
 
-    def sniff_prefix(self, file_prefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         for _, line in zip(range(self._search_lines), file_prefix.line_iterator()):
             if line.startswith(self._TYPES_DIRECTIVE):
                 return True
diff --git a/lib/galaxy/datatypes/qualityscore.py b/lib/galaxy/datatypes/qualityscore.py
index 1ce98a17600..49ddc9c3eff 100644
--- a/lib/galaxy/datatypes/qualityscore.py
+++ b/lib/galaxy/datatypes/qualityscore.py
@@ -2,6 +2,7 @@
 Qualityscore class
 """
 import logging
+from typing import TYPE_CHECKING
 
 from galaxy.datatypes.sniff import (
     build_sniff_from_prefix,
@@ -9,6 +10,9 @@ from galaxy.datatypes.sniff import (
 )
 from . import data
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 
@@ -31,7 +35,7 @@ class QualityScoreSOLiD(QualityScore):
     edam_format = "format_3610"
     file_ext = "qualsolid"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         >>> from galaxy.datatypes.sniff import get_test_fname
         >>> fname = get_test_fname( 'sequence.fasta' )
@@ -65,11 +69,11 @@ class QualityScoreSOLiD(QualityScore):
                     return False
         return goodblock > 0
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         if self.max_optional_metadata_filesize >= 0 and dataset.get_size() > self.max_optional_metadata_filesize:
             dataset.metadata.data_lines = None
             return
-        return QualityScore.set_meta(self, dataset, **kwd)
+        return QualityScore.set_meta(self, dataset, overwrite=overwrite, **kwd)
 
 
 @build_sniff_from_prefix
@@ -81,7 +85,7 @@ class QualityScore454(QualityScore):
     edam_format = "format_3611"
     file_ext = "qual454"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         >>> from galaxy.datatypes.sniff import get_test_fname
         >>> fname = get_test_fname( 'sequence.fasta' )
diff --git a/lib/galaxy/datatypes/sequence.py b/lib/galaxy/datatypes/sequence.py
index 9b31c35ff89..040d68ede75 100644
--- a/lib/galaxy/datatypes/sequence.py
+++ b/lib/galaxy/datatypes/sequence.py
@@ -10,6 +10,15 @@ import re
 import string
 import subprocess
 from itertools import islice
+from typing import (
+    Any,
+    Callable,
+    Dict,
+    Iterable,
+    List,
+    Optional,
+    TYPE_CHECKING,
+)
 
 import bx.align.maf
 from markupsafe import escape
@@ -36,6 +45,12 @@ from galaxy.util.checkers import is_gzip
 from galaxy.util.image_util import check_image_type
 from . import data
 
+if TYPE_CHECKING:
+    from galaxy.model import (
+        DatasetInstance,
+        HistoryDatasetAssociation,
+    )
+
 log = logging.getLogger(__name__)
 
 
@@ -56,7 +71,7 @@ class SequenceSplitLocations(data.Text):
 
     file_ext = "fqtoc"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             try:
                 parsed_data = json.load(open(dataset.file_name))
@@ -70,7 +85,7 @@ class SequenceSplitLocations(data.Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         if file_prefix.file_size < 50000 and not file_prefix.truncated:
             try:
                 data = json.loads(file_prefix.contents_header)
@@ -93,7 +108,7 @@ class Sequence(data.Text):
         name="sequences", default=0, desc="Number of sequences", readonly=True, visible=False, optional=True, no_value=0
     )
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the number of sequences and the number of data lines in dataset.
         """
@@ -113,7 +128,7 @@ class Sequence(data.Text):
             dataset.metadata.data_lines = data_lines
             dataset.metadata.sequences = sequences
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
             if dataset.metadata.sequences:
@@ -125,7 +140,7 @@ class Sequence(data.Text):
             dataset.blurb = "file purged from disk"
 
     @staticmethod
-    def get_sequences_per_file(total_sequences, split_params):
+    def get_sequences_per_file(total_sequences: int, split_params: Dict) -> List:
         if split_params["split_mode"] == "number_of_parts":
             # legacy basic mode - split into a specified number of parts
             parts = int(split_params["split_size"])
@@ -136,7 +151,7 @@ class Sequence(data.Text):
             # loop through the sections and calculate the number of sequences
             chunk_size = int(split_params["split_size"])
             rem = total_sequences % chunk_size
-            sequences_per_file = [chunk_size for i in range(total_sequences / chunk_size)]
+            sequences_per_file = [chunk_size for i in range(total_sequences // chunk_size)]
             # TODO: Should we invest the time in a better way to handle small remainders?
             if rem > 0:
                 sequences_per_file.append(rem)
@@ -203,14 +218,17 @@ class Sequence(data.Text):
             start_sequence += sequences_per_file[part_no]
         return directories
 
-    def split(cls, input_datasets, subdir_generator_function, split_params):
+    @classmethod
+    def split(cls, input_datasets: List, subdir_generator_function: Callable, split_params: Dict) -> None:
         """Split a generic sequence file (not sensible or possible, see subclasses)."""
         if split_params is None:
             return None
         raise NotImplementedError("Can't split generic sequence files")
 
     @staticmethod
-    def get_split_commands_with_toc(input_name, output_name, toc_file, start_sequence, sequence_count):
+    def get_split_commands_with_toc(
+        input_name: str, output_name: str, toc_file: Any, start_sequence: int, sequence_count: int
+    ) -> List:
         """
         Uses a Table of Contents dict, parsed from an FQTOC file, to come up with a set of
         shell commands that will extract the parts necessary
@@ -288,7 +306,9 @@ class Sequence(data.Text):
         return result
 
     @staticmethod
-    def get_split_commands_sequential(is_compressed, input_name, output_name, start_sequence, sequence_count):
+    def get_split_commands_sequential(
+        is_compressed: bool, input_name: str, output_name: str, start_sequence: int, sequence_count: int
+    ) -> List:
         """
         Does a brain-dead sequential scan & extract of certain sequences
         >>> Sequence.get_split_commands_sequential(True, './input.gz', './output.gz', start_sequence=0, sequence_count=10)
@@ -317,7 +337,8 @@ class Alignment(data.Text):
         name="species", desc="Species", default=[], param=metadata.SelectParameter, multiple=True, readonly=True
     )
 
-    def split(cls, input_datasets, subdir_generator_function, split_params):
+    @classmethod
+    def split(cls, input_datasets: List, subdir_generator_function: Callable, split_params: Dict) -> None:
         """Split a generic alignment file (not sensible or possible, see subclasses)."""
         if split_params is None:
             return None
@@ -331,7 +352,7 @@ class Fasta(Sequence):
     edam_format = "format_1929"
     file_ext = "fasta"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in fasta format
 
@@ -387,7 +408,7 @@ class Fasta(Sequence):
         return False
 
     @classmethod
-    def split(cls, input_datasets, subdir_generator_function, split_params):
+    def split(cls, input_datasets: List, subdir_generator_function: Callable, split_params: Dict) -> None:
         """Split a FASTA file sequence by sequence.
 
         Note that even if split_mode="number_of_parts", the actual number of
@@ -432,7 +453,7 @@ class Fasta(Sequence):
             raise Exception(f"Unsupported split mode {split_params['split_mode']}")
 
     @classmethod
-    def _size_split(cls, input_file, chunk_size, subdir_generator_function):
+    def _size_split(cls, input_file: str, chunk_size: int, subdir_generator_function: Callable) -> None:
         """Split a FASTA file into chunks based on size on disk.
 
         This does of course preserve complete records - it only splits at the
@@ -470,7 +491,7 @@ class Fasta(Sequence):
                     part_file.close()
 
     @classmethod
-    def _count_split(cls, input_file, chunk_size, subdir_generator_function):
+    def _count_split(cls, input_file: str, chunk_size: int, subdir_generator_function: Callable) -> None:
         """Split a FASTA file into chunks based on counting records."""
         log.debug("Attemping to split FASTA file %s into chunks of %i sequences" % (input_file, chunk_size))
         with open(input_file) as f:
@@ -512,7 +533,7 @@ class csFasta(Sequence):
     edam_format = "format_3589"
     file_ext = "csfasta"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Color-space sequence:
             >2_15_85_F3
@@ -543,12 +564,12 @@ class csFasta(Sequence):
                     return False
         return False
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         if self.max_optional_metadata_filesize >= 0 and dataset.get_size() > self.max_optional_metadata_filesize:
             dataset.metadata.data_lines = None
             dataset.metadata.sequences = None
             return
-        return Sequence.set_meta(self, dataset, **kwd)
+        return Sequence.set_meta(self, dataset, overwrite=overwrite, **kwd)
 
 
 @build_sniff_from_prefix
@@ -572,7 +593,7 @@ class Fastg(Sequence):
         no_value={},
     )
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """FASTG must begin with lines:
            #FASTG:begin;
            #FASTG:version=*.*;
@@ -620,7 +641,7 @@ class Fastg(Sequence):
                     break  # we found a non-empty line, but it's not a header
         return False
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         with open(dataset.file_name) as fh:
             for i, line in enumerate(fh):
                 if not line:
@@ -643,9 +664,9 @@ class Fastg(Sequence):
             dataset.metadata.data_lines = None
             dataset.metadata.sequences = None
             return
-        return Sequence.set_meta(self, dataset, **kwd)
+        return Sequence.set_meta(self, dataset, overwrite=overwrite, **kwd)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
             if dataset.metadata.sequences:
@@ -669,7 +690,7 @@ class BaseFastq(Sequence):
     file_ext = "fastq"
     bases_regexp = re.compile(r"^[NGTAC 0123\.]*$", re.IGNORECASE)
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the number of sequences and the number of data lines
         in dataset.
@@ -702,7 +723,7 @@ class BaseFastq(Sequence):
             dataset.metadata.data_lines = data_lines
             dataset.metadata.sequences = sequences
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in generic fastq format
         For details, see http://maq.sourceforge.net/fastq.shtml
@@ -747,7 +768,15 @@ class BaseFastq(Sequence):
             return False
         return self.check_first_block(file_prefix)
 
-    def display_data(self, trans, dataset, preview=False, filename=None, to_ext=None, **kwd):
+    def display_data(
+        self,
+        trans,
+        dataset: "HistoryDatasetAssociation",
+        preview: bool = False,
+        filename: Optional[str] = None,
+        to_ext: Optional[str] = None,
+        **kwd,
+    ):
         headers = kwd.get("headers", {})
         if preview:
             with compression_utils.get_fileobj(dataset.file_name) as fh:
@@ -766,7 +795,7 @@ class BaseFastq(Sequence):
             return Sequence.display_data(self, trans, dataset, preview, filename, to_ext, **kwd)
 
     @classmethod
-    def split(cls, input_datasets, subdir_generator_function, split_params):
+    def split(cls, input_datasets: List, subdir_generator_function: Callable, split_params: Dict) -> None:
         """
         FASTQ files are split on cluster boundaries, in increments of 4 lines
         """
@@ -791,7 +820,7 @@ class BaseFastq(Sequence):
         return cls.do_slow_split(input_datasets, subdir_generator_function, split_params)
 
     @staticmethod
-    def process_split_file(data):
+    def process_split_file(data: Dict) -> bool:
         """
         This is called in the context of an external process launched by a Task (possibly not on the Galaxy machine)
         to create the input files for the Task. The parameters:
@@ -818,7 +847,7 @@ class BaseFastq(Sequence):
         return True
 
     @staticmethod
-    def quality_check(lines):
+    def quality_check(lines: Iterable) -> bool:
         return True
 
     @classmethod
@@ -828,7 +857,7 @@ class BaseFastq(Sequence):
         return cls.check_block(block)
 
     @classmethod
-    def check_block(cls, block):
+    def check_block(cls, block: List) -> bool:
         if (
             len(block) == 4
             and block[0][0]
@@ -845,7 +874,7 @@ class BaseFastq(Sequence):
                     return True
         return False
 
-    def validate(self, dataset, **kwd):
+    def validate(self, dataset: "DatasetInstance", **kwd) -> DatatypeValidation:
         headers = iter_headers(dataset.file_name, sep="\n", count=-1)
         # check to see if the base qualities match
         if not self.quality_check(headers):
@@ -880,7 +909,7 @@ class FastqSanger(Fastq):
     bases_regexp = re.compile("^[NGTAC]*$", re.IGNORECASE)
 
     @staticmethod
-    def quality_check(lines):
+    def quality_check(lines: Iterable) -> bool:
         """
         Presuming lines are lines from a fastq file,
         return True if the qualities are compatible with sanger encoding
@@ -901,7 +930,7 @@ class FastqSolexa(Fastq):
     file_ext = "fastqsolexa"
 
     @staticmethod
-    def quality_check(lines):
+    def quality_check(lines: Iterable) -> bool:
         """
         Presuming lines are lines from a fastq file,
         return True if the qualities are compatible with sanger encoding
@@ -911,7 +940,7 @@ class FastqSolexa(Fastq):
                 return False
         return True
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         # we expicitely do not want to have this sniffed. so we keep this here
         # such that it can not be enabled in datatypes_conf
         raise NotImplementedError
@@ -927,7 +956,7 @@ class FastqIllumina(Fastq):
     file_ext = "fastqillumina"
 
     @staticmethod
-    def quality_check(lines):
+    def quality_check(lines: Iterable) -> bool:
         """
         Presuming lines are lines from a fastq file,
         return True if the qualities are compatible with sanger encoding
@@ -937,7 +966,7 @@ class FastqIllumina(Fastq):
                 return False
         return True
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         # we expicitely do not want to have this sniffed. so we keep this here
         # such that it can not be enabled in datatypes_conf
         raise NotImplementedError
@@ -982,10 +1011,12 @@ class Maf(Alignment):
         optional=True,
     )
 
-    def init_meta(self, dataset, copy_from=None):
+    def init_meta(self, dataset: "DatasetInstance", copy_from: Optional["DatasetInstance"] = None) -> None:
         Alignment.init_meta(self, dataset, copy_from=copy_from)
 
-    def set_meta(self, dataset, overwrite=True, metadata_tmp_files_dir=None, **kwd):
+    def set_meta(
+        self, dataset: "DatasetInstance", overwrite: bool = True, metadata_tmp_files_dir: Optional[str] = None, **kwd
+    ) -> None:
         """
         Parses and sets species, chromosomes, index from MAF file.
         """
@@ -1018,7 +1049,7 @@ class Maf(Alignment):
         indexes.write(open(index_file.file_name, "wb"))
         dataset.metadata.maf_index = index_file
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             # The file must exist on disk for the get_file_peek() method
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -1032,15 +1063,15 @@ class Maf(Alignment):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Returns formated html of peek"""
         return self.make_html_table(dataset)
 
-    def make_html_table(self, dataset, skipchars=None):
+    def make_html_table(self, dataset: "DatasetInstance", skipchars: Optional[List] = None) -> str:
         """Create HTML table, used for displaying peek"""
         skipchars = skipchars or []
-        out = ['<table cellspacing="0" cellpadding="3">']
         try:
+            out = ['<table cellspacing="0" cellpadding="3">']
             out.append("<tr><th>Species:&nbsp;")
             for species in dataset.metadata.species:
                 out.append(f"{species}&nbsp;")
@@ -1055,12 +1086,11 @@ class Maf(Alignment):
                     continue
                 out.append(f"<tr><td>{escape(line)}</td></tr>")
             out.append("</table>")
-            out = "".join(out)
+            return "".join(out)
         except Exception as exc:
-            out = f"Can't create peek {exc}"
-        return out
+            return f"Can't create peek {exc}"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines wether the file is in maf format
 
@@ -1112,7 +1142,7 @@ class MafCustomTrack(data.Text):
         name="vp_end", default="100", desc="Viewport End", readonly=True, optional=True, visible=False, no_value=""
     )
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Parses and sets viewport metadata from MAF file.
         """
@@ -1155,7 +1185,7 @@ class Axt(data.Text):
     edam_format = "format_3013"
     file_ext = "axt"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in axt format
 
@@ -1199,6 +1229,7 @@ class Axt(data.Text):
                     return False
                 else:
                     return True
+        return False
 
 
 @build_sniff_from_prefix
@@ -1213,7 +1244,7 @@ class Lav(data.Text):
     edam_format = "format_3014"
     file_ext = "lav"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in lav format
 
@@ -1244,7 +1275,7 @@ class RNADotPlotMatrix(data.Data):
     edam_format = "format_3466"
     file_ext = "rna_eps"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "RNA Dot Plot format (Postscript derivative)"
             dataset.blurb = nice_size(dataset.get_size())
@@ -1252,7 +1283,7 @@ class RNADotPlotMatrix(data.Data):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """Determine if the file is in RNA dot plot format."""
         if check_image_type(filename, ["EPS"]):
             seq = False
@@ -1282,7 +1313,7 @@ class DotBracket(Sequence):
     sequence_regexp = re.compile(r"^[ACGTURYKMSWBDHVN]+$", re.I)
     structure_regexp = re.compile(r"^[\(\)\.\[\]{}]+$")
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the number of sequences and the number of data lines
         in dataset.
@@ -1306,7 +1337,7 @@ class DotBracket(Sequence):
         dataset.metadata.data_lines = data_lines
         dataset.metadata.sequences = sequences
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Galaxy Dbn (Dot-Bracket notation) rules:
 
@@ -1382,7 +1413,7 @@ class Genbank(data.Text):
     edam_data = "data_0849"
     file_ext = "genbank"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determine whether the file is in genbank format.
         Works for compressed files.
@@ -1404,7 +1435,7 @@ class MemePsp(Sequence):
 
     file_ext = "memepsp"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         The format of an entry in a PSP file is:
 
diff --git a/lib/galaxy/datatypes/sniff.py b/lib/galaxy/datatypes/sniff.py
index 5839b5a2927..9f557c85a2c 100644
--- a/lib/galaxy/datatypes/sniff.py
+++ b/lib/galaxy/datatypes/sniff.py
@@ -298,6 +298,12 @@ def guess_ext(fname_or_file_prefix: Union[str, "FilePrefix"], sniff_order, is_bi
     >>> fname = get_test_fname('megablast_xml_parser_test1.blastxml')
     >>> guess_ext(fname, sniff_order)
     'blastxml'
+    >>> fname = get_test_fname('1.psl')
+    >>> guess_ext(fname, sniff_order)
+    'psl'
+    >>> fname = get_test_fname('2.psl')
+    >>> guess_ext(fname, sniff_order)
+    'psl'
     >>> fname = get_test_fname('interval.interval')
     >>> guess_ext(fname, sniff_order)
     'interval'
diff --git a/lib/galaxy/datatypes/spaln.py b/lib/galaxy/datatypes/spaln.py
index 78f961a829e..6ce094e341d 100644
--- a/lib/galaxy/datatypes/spaln.py
+++ b/lib/galaxy/datatypes/spaln.py
@@ -4,11 +4,27 @@ spaln Composite Dataset
 
 import logging
 import os.path
+from typing import (
+    Callable,
+    Dict,
+    List,
+    Optional,
+    TYPE_CHECKING,
+)
 
-from galaxy.datatypes.data import Data
+from galaxy.datatypes.data import (
+    Data,
+    GeneratePrimaryFileDataset,
+)
 from galaxy.datatypes.metadata import MetadataElement
 from galaxy.util import smart_str
 
+if TYPE_CHECKING:
+    from galaxy.model import (
+        DatasetInstance,
+        HistoryDatasetAssociation,
+    )
+
 log = logging.getLogger(__name__)
 verbose = True
 
@@ -52,7 +68,7 @@ class _SpalnDb(Data):
             substitute_name_with_metadata="spalndb_name",
         )
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         rval = ["<html><head><title>Spaln Database</title></head><p/>"]
         rval.append("<div>This composite dataset is composed of the following files:<p/><ul>")
         for composite_name, composite_file in self.get_composite_files(dataset=dataset).items():
@@ -68,7 +84,7 @@ class _SpalnDb(Data):
         rval.append("</ul></div></html>")
         return "\n".join(rval)
 
-    def regenerate_primary_file(self, dataset):
+    def regenerate_primary_file(self, dataset: "DatasetInstance") -> None:
         """
         cannot do this until we are setting metadata
         """
@@ -87,7 +103,7 @@ class _SpalnDb(Data):
             f.write("\n".join(rval))
             f.write("\n")
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text."""
         if not dataset.dataset.purged:
             dataset.peek = "spaln database (multiple files)"
@@ -96,14 +112,24 @@ class _SpalnDb(Data):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Create HTML content, used for displaying peek."""
         try:
             return dataset.peek
         except Exception:
             return "spaln database (multiple files)"
 
-    def display_data(self, trans, data, preview=False, filename=None, to_ext=None, size=None, offset=None, **kwd):
+    def display_data(
+        self,
+        trans,
+        dataset: "HistoryDatasetAssociation",
+        preview: bool = False,
+        filename: Optional[str] = None,
+        to_ext: Optional[str] = None,
+        offset: Optional[int] = None,
+        ck_size: Optional[int] = None,
+        **kwd,
+    ):
         """
         If preview is `True` allows us to format the data shown in the central pane via the "eye" icon.
         If preview is `False` triggers download.
@@ -112,12 +138,12 @@ class _SpalnDb(Data):
         if not preview:
             return super().display_data(
                 trans,
-                data=data,
+                dataset=dataset,
                 preview=preview,
                 filename=filename,
                 to_ext=to_ext,
-                size=size,
                 offset=offset,
+                ck_size=ck_size,
                 headers=headers,
                 **kwd,
             )
@@ -133,7 +159,7 @@ class _SpalnDb(Data):
         msg = ""
         try:
             # Try to use any text recorded in the dummy index file:
-            with open(data.file_name, encoding="utf-8") as handle:
+            with open(dataset.file_name, encoding="utf-8") as handle:
                 msg = handle.read().strip()
         except Exception:
             pass
@@ -145,18 +171,20 @@ class _SpalnDb(Data):
             headers,
         )
 
-    def merge(split_files, output_file):
+    @staticmethod
+    def merge(split_files: List[str], output_file: str) -> None:
         """Merge spaln databases (not implemented)."""
         raise NotImplementedError("Merging spaln databases is not possible")
 
-    def split(cls, input_datasets, subdir_generator_function, split_params):
+    @classmethod
+    def split(cls, input_datasets: List, subdir_generator_function: Callable, split_params: Dict) -> None:
         """Split a spaln database (not implemented)."""
         if split_params is None:
             return None
         raise NotImplementedError("Can't split spaln database")
 
-    def set_meta(self, dataset, **kwd):
-        super().set_meta(dataset, **kwd)
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
         efp = dataset.extra_files_path
         for filename in os.listdir(efp):
             if filename.endswith(".ent"):
diff --git a/lib/galaxy/datatypes/speech.py b/lib/galaxy/datatypes/speech.py
index 4fd325913e3..559cffee5d4 100644
--- a/lib/galaxy/datatypes/speech.py
+++ b/lib/galaxy/datatypes/speech.py
@@ -1,3 +1,5 @@
+from typing import TYPE_CHECKING
+
 from galaxy.datatypes.data import Text
 from galaxy.datatypes.metadata import (
     ListParameter,
@@ -5,6 +7,9 @@ from galaxy.datatypes.metadata import (
 )
 from galaxy.datatypes.sniff import get_headers
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 
 class TextGrid(Text):
     """Praat Textgrid file for speech annotations
@@ -35,7 +40,7 @@ class TextGrid(Text):
         no_value=[],
     )
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
 
         with open(filename) as fd:
             text = fd.read(len(self.header))
@@ -97,7 +102,7 @@ class BPF(Text):
         "SAO",
     ]
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """Set the metadata for this dataset from the file contents"""
         types = set()
         with open(dataset.dataset.file_name) as fd:
@@ -110,11 +115,11 @@ class BPF(Text):
                 if len(parts) and len(parts[0]) == 3:
                     types.add(parts[0])
                 else:
-                    return False
+                    return
 
         dataset.metadata.annotations = list(types)
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         # We loop over 30 as there are 9 mandatory headers (the last should be
         # `LBD:`), while there are 21 optional headers that can be
         # interspersed.
diff --git a/lib/galaxy/datatypes/tabular.py b/lib/galaxy/datatypes/tabular.py
index 4422921ba7c..442cff28e59 100644
--- a/lib/galaxy/datatypes/tabular.py
+++ b/lib/galaxy/datatypes/tabular.py
@@ -13,8 +13,12 @@ import subprocess
 import tempfile
 from json import dumps
 from typing import (
+    cast,
+    Dict,
+    List,
     Optional,
     TYPE_CHECKING,
+    Union,
 )
 
 import pysam
@@ -27,6 +31,24 @@ from galaxy.datatypes import (
     metadata,
 )
 from galaxy.datatypes.binary import _BamOrSam
+from galaxy.datatypes.data import (
+    DatatypeValidation,
+    Text,
+)
+from galaxy.datatypes.dataproviders.column import (
+    ColumnarDataProvider,
+    DictDataProvider,
+)
+from galaxy.datatypes.dataproviders.dataset import (
+    DatasetColumnarDataProvider,
+    DatasetDataProvider,
+    DatasetDictDataProvider,
+    GenomicRegionDataProvider,
+)
+from galaxy.datatypes.dataproviders.line import (
+    FilteredLineDataProvider,
+    RegexLineDataProvider,
+)
 from galaxy.datatypes.metadata import (
     MetadataElement,
     MetadataParameter,
@@ -39,6 +61,10 @@ from galaxy.datatypes.sniff import (
     validate_tabular,
 )
 from galaxy.util import compression_utils
+from galaxy.util.compression_utils import (
+    FileObjType,
+    FileObjTypeStr,
+)
 from galaxy.util.markdown import (
     indicate_data_truncated,
     pre_formatted_contents,
@@ -46,7 +72,10 @@ from galaxy.util.markdown import (
 from . import dataproviders
 
 if TYPE_CHECKING:
-    from galaxy.model import DatasetInstance
+    from galaxy.model import (
+        DatasetInstance,
+        HistoryDatasetAssociation,
+    )
 
 log = logging.getLogger(__name__)
 
@@ -54,7 +83,7 @@ MAX_DATA_LINES = 100000
 
 
 @dataproviders.decorators.has_dataproviders
-class TabularData(data.Text):
+class TabularData(Text):
     """Generic tabular data"""
 
     edam_format = "format_3475"
@@ -93,11 +122,12 @@ class TabularData(data.Text):
     )
 
     @abc.abstractmethod
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", *, overwrite: bool = True, **kwd) -> None:
         raise NotImplementedError
 
-    def set_peek(self, dataset, line_count=None, WIDTH=256, skipchars=None, line_wrap=False, **kwd):
-        super().set_peek(dataset, line_count=line_count, WIDTH=WIDTH, skipchars=skipchars, line_wrap=line_wrap)
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
+        kwd.setdefault("line_wrap", False)
+        super().set_peek(dataset, **kwd)
         if dataset.metadata.comment_lines:
             dataset.blurb = f"{dataset.blurb}, {util.commaify(str(dataset.metadata.comment_lines))} comments"
 
@@ -135,7 +165,17 @@ class TabularData(data.Text):
             last_read = f.tell()
         return ck_data, last_read
 
-    def display_data(self, trans, dataset, preview=False, filename=None, to_ext=None, offset=None, ck_size=None, **kwd):
+    def display_data(
+        self,
+        trans,
+        dataset: "HistoryDatasetAssociation",
+        preview: bool = False,
+        filename: Optional[str] = None,
+        to_ext: Optional[str] = None,
+        offset: Optional[int] = None,
+        ck_size: Optional[int] = None,
+        **kwd,
+    ):
         headers = kwd.get("headers", {})
         preview = util.string_as_bool(preview)
         if offset is not None:
@@ -185,7 +225,7 @@ class TabularData(data.Text):
                 headers,
             )
 
-    def display_as_markdown(self, dataset_instance):
+    def display_as_markdown(self, dataset_instance: "DatasetInstance") -> str:
         with open(dataset_instance.file_name) as f:
             contents = f.read(data.DEFAULT_MAX_PEEK_SIZE)
         markdown = self.make_html_table(dataset_instance, peek=contents)
@@ -193,27 +233,26 @@ class TabularData(data.Text):
             markdown += indicate_data_truncated()
         return pre_formatted_contents(markdown)
 
-    def make_html_table(self, dataset, **kwargs):
+    def make_html_table(self, dataset: "DatasetInstance", **kwargs) -> str:
         """Create HTML table, used for displaying peek"""
-        out = ['<table cellspacing="0" cellpadding="3">']
         try:
+            out = ['<table cellspacing="0" cellpadding="3">']
             out.append(self.make_html_peek_header(dataset, **kwargs))
             out.append(self.make_html_peek_rows(dataset, **kwargs))
             out.append("</table>")
-            out = "".join(out)
+            return "".join(out)
         except Exception as exc:
-            out = f"Can't create peek: {util.unicodify(exc)}"
-        return out
+            return f"Can't create peek: {util.unicodify(exc)}"
 
     def make_html_peek_header(
         self,
-        dataset,
-        skipchars=None,
-        column_names=None,
-        column_number_format="%s",
-        column_parameter_alias=None,
+        dataset: "DatasetInstance",
+        skipchars: Optional[List] = None,
+        column_names: Optional[List] = None,
+        column_number_format: str = "%s",
+        column_parameter_alias: Optional[Dict] = None,
         **kwargs,
-    ):
+    ) -> str:
         if skipchars is None:
             skipchars = []
         if column_names is None:
@@ -232,6 +271,7 @@ class TabularData(data.Text):
             column_headers = [None] * columns
 
             # fill in empty headers with data from column_names
+            assert column_names is not None
             for i in range(min(columns, len(column_names))):
                 if column_headers[i] is None and column_names[i] is not None:
                     column_headers[i] = column_names[i]
@@ -260,7 +300,7 @@ class TabularData(data.Text):
             raise Exception(f"Can't create peek header: {util.unicodify(exc)}")
         return "".join(out)
 
-    def make_html_peek_rows(self, dataset, skipchars=None, **kwargs):
+    def make_html_peek_rows(self, dataset: "DatasetInstance", skipchars: Optional[List] = None, **kwargs) -> str:
         if skipchars is None:
             skipchars = []
         out = []
@@ -297,36 +337,66 @@ class TabularData(data.Text):
             raise Exception(f"Can't create peek rows: {util.unicodify(exc)}")
         return "".join(out)
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Returns formatted html of peek"""
         return self.make_html_table(dataset)
 
+    def is_int(self, column_text: str) -> bool:
+        # Don't allow underscores in numeric literals (PEP 515)
+        if "_" in column_text:
+            return False
+        try:
+            int(column_text)
+            return True
+        except ValueError:
+            return False
+
+    def is_float(self, column_text: str) -> bool:
+        # Don't allow underscores in numeric literals (PEP 515)
+        if "_" in column_text:
+            return False
+        try:
+            float(column_text)
+            return True
+        except ValueError:
+            if column_text.strip().lower() == "na":
+                return True  # na is special cased to be a float
+            return False
+
+    def guess_type(self, text: str) -> str:
+        if self.is_int(text):
+            return "int"
+        if self.is_float(text):
+            return "float"
+        else:
+            return "str"
+
     # ------------- Dataproviders
-    @dataproviders.decorators.dataprovider_factory("column", dataproviders.column.ColumnarDataProvider.settings)
-    def column_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("column", ColumnarDataProvider.settings)
+    def column_dataprovider(self, dataset: "DatasetInstance", **settings) -> ColumnarDataProvider:
         """Uses column settings that are passed in"""
-        dataset_source = dataproviders.dataset.DatasetDataProvider(dataset)
+        dataset_source = DatasetDataProvider(dataset)
         delimiter = dataset.metadata.delimiter
-        return dataproviders.column.ColumnarDataProvider(dataset_source, deliminator=delimiter, **settings)
+        return ColumnarDataProvider(dataset_source, deliminator=delimiter, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("dataset-column", dataproviders.column.ColumnarDataProvider.settings)
-    def dataset_column_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("dataset-column", ColumnarDataProvider.settings)
+    def dataset_column_dataprovider(self, dataset: "DatasetInstance", **settings) -> DatasetColumnarDataProvider:
         """Attempts to get column settings from dataset.metadata"""
         delimiter = dataset.metadata.delimiter
-        return dataproviders.dataset.DatasetColumnarDataProvider(dataset, deliminator=delimiter, **settings)
+        return DatasetColumnarDataProvider(dataset, deliminator=delimiter, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("dict", dataproviders.column.DictDataProvider.settings)
-    def dict_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("dict", DictDataProvider.settings)
+    def dict_dataprovider(self, dataset: "DatasetInstance", **settings) -> DictDataProvider:
         """Uses column settings that are passed in"""
-        dataset_source = dataproviders.dataset.DatasetDataProvider(dataset)
+        dataset_source = DatasetDataProvider(dataset)
         delimiter = dataset.metadata.delimiter
-        return dataproviders.column.DictDataProvider(dataset_source, deliminator=delimiter, **settings)
+        return DictDataProvider(dataset_source, deliminator=delimiter, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("dataset-dict", dataproviders.column.DictDataProvider.settings)
-    def dataset_dict_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("dataset-dict", DictDataProvider.settings)
+    def dataset_dict_dataprovider(self, dataset: "DatasetInstance", **settings) -> DatasetDictDataProvider:
         """Attempts to get column settings from dataset.metadata"""
         delimiter = dataset.metadata.delimiter
-        return dataproviders.dataset.DatasetDictDataProvider(dataset, deliminator=delimiter, **settings)
+        return DatasetDictDataProvider(dataset, deliminator=delimiter, **settings)
 
 
 @dataproviders.decorators.has_dataproviders
@@ -335,12 +405,19 @@ class Tabular(TabularData):
 
     file_ext = "tabular"
 
-    def get_column_names(self, first_line=None):
+    def get_column_names(self, first_line: str) -> Optional[List[str]]:
         return None
 
     def set_meta(
-        self, dataset, overwrite=True, skip=None, max_data_lines=MAX_DATA_LINES, max_guess_type_data_lines=None, **kwd
-    ):
+        self,
+        dataset: "DatasetInstance",
+        *,
+        overwrite: bool = True,
+        skip: Optional[int] = None,
+        max_data_lines: Optional[int] = MAX_DATA_LINES,
+        max_guess_type_data_lines: Optional[int] = None,
+        **kwd,
+    ) -> None:
         """
         Tries to determine the number of columns as well as those columns that
         contain numerical values in the dataset.  A skip parameter is used
@@ -431,7 +508,7 @@ class Tabular(TabularData):
         data_lines = 0
         comment_lines = 0
         column_names = None
-        column_types = []
+        column_types: List = []
         first_line_column_types = [default_column_type]  # default value is one column of type str
         if dataset.has_data():
             # NOTE: if skip > num_check_lines, we won't detect any metadata, and will use default
@@ -474,8 +551,10 @@ class Tabular(TabularData):
                             column_types = [None for col in first_line_column_types]
                     if max_data_lines is not None and data_lines >= max_data_lines:
                         if dataset_fh.tell() != dataset.get_size():
-                            data_lines = None  # Clear optional data_lines metadata value
-                            comment_lines = None  # Clear optional comment_lines metadata value; additional comment lines could appear below this point
+                            # Clear optional data_lines metadata value
+                            data_lines = None  # type: ignore [assignment]
+                            # Clear optional comment_lines metadata value; additional comment lines could appear below this point
+                            comment_lines = None  # type: ignore [assignment]
                         break
                     i += 1
 
@@ -500,10 +579,10 @@ class Tabular(TabularData):
         if column_names is not None:
             dataset.metadata.column_names = column_names
 
-    def as_gbrowse_display_file(self, dataset, **kwd):
+    def as_gbrowse_display_file(self, dataset: "DatasetInstance", **kwd) -> Union[FileObjType, str]:
         return open(dataset.file_name, "rb")
 
-    def as_ucsc_display_file(self, dataset, **kwd):
+    def as_ucsc_display_file(self, dataset: "DatasetInstance", **kwd) -> Union[FileObjType, str]:
         return open(dataset.file_name, "rb")
 
 
@@ -513,11 +592,11 @@ class SraManifest(Tabular):
     file_ext = "sra_manifest.tabular"
     data_line_offset = 1
 
-    def set_meta(self, dataset, **kwds):
-        super().set_meta(dataset, **kwds)
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
         dataset.metadata.comment_lines = 1
 
-    def get_column_names(self, first_line):
+    def get_column_names(self, first_line: str) -> Optional[List[str]]:
         return first_line.strip().split("\t")
 
 
@@ -554,7 +633,7 @@ class Taxonomy(Tabular):
             "Subspecies",
         ]
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Returns formated html of peek"""
         return self.make_html_table(dataset, column_names=self.column_names)
 
@@ -645,11 +724,11 @@ class Sam(Tabular, _BamOrSam):
             "OPT",
         ]
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Returns formated html of peek"""
         return self.make_html_table(dataset, column_names=self.column_names)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in SAM format
 
@@ -701,7 +780,14 @@ class Sam(Tabular, _BamOrSam):
             return True
         return False
 
-    def set_meta(self, dataset, overwrite=True, skip=None, max_data_lines=5, **kwd):
+    def set_meta(
+        self,
+        dataset: "DatasetInstance",
+        overwrite: bool = True,
+        skip: Optional[int] = None,
+        max_data_lines: Optional[int] = 5,
+        **kwd,
+    ) -> None:
         """
         >>> from galaxy.datatypes.sniff import get_test_fname
         >>> from galaxy.datatypes.registry import example_datatype_registry_for_sample
@@ -739,8 +825,8 @@ class Sam(Tabular, _BamOrSam):
                             break
                 else:
                     # Otherwise, read the whole thing and set num data lines.
-                    for i, l in enumerate(dataset_fh):  # noqa: B007
-                        if l.startswith("@"):
+                    for i, line in enumerate(dataset_fh):  # noqa: B007
+                        if line.startswith("@"):
                             comment_lines += 1
                     dataset.metadata.data_lines = i + 1 - comment_lines
             dataset.metadata.comment_lines = comment_lines
@@ -760,10 +846,10 @@ class Sam(Tabular, _BamOrSam):
                 "str",
             ]
 
-            _BamOrSam().set_meta(dataset)
+            _BamOrSam().set_meta(dataset, overwrite=overwrite, **kwd)
 
     @staticmethod
-    def merge(split_files, output_file):
+    def merge(split_files: List[str], output_file: str) -> None:
         """
         Multiple SAM files may each have headers. Since the headers should all be the same, remove
         the headers from files 1-n, keeping them in the first file only
@@ -777,62 +863,58 @@ class Sam(Tabular, _BamOrSam):
     # Dataproviders
     # sam does not use '#' to indicate comments/headers - we need to strip out those headers from the std. providers
     # TODO:?? seems like there should be an easier way to do this - metadata.comment_char?
-    @dataproviders.decorators.dataprovider_factory("line", dataproviders.line.FilteredLineDataProvider.settings)
-    def line_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("line", FilteredLineDataProvider.settings)
+    def line_dataprovider(self, dataset: "DatasetInstance", **settings) -> FilteredLineDataProvider:
         settings["comment_char"] = "@"
         return super().line_dataprovider(dataset, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("regex-line", dataproviders.line.RegexLineDataProvider.settings)
-    def regex_line_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("regex-line", RegexLineDataProvider.settings)
+    def regex_line_dataprovider(self, dataset: "DatasetInstance", **settings) -> RegexLineDataProvider:
         settings["comment_char"] = "@"
         return super().regex_line_dataprovider(dataset, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("column", dataproviders.column.ColumnarDataProvider.settings)
-    def column_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("column", ColumnarDataProvider.settings)
+    def column_dataprovider(self, dataset: "DatasetInstance", **settings) -> ColumnarDataProvider:
         settings["comment_char"] = "@"
         return super().column_dataprovider(dataset, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("dataset-column", dataproviders.column.ColumnarDataProvider.settings)
-    def dataset_column_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("dataset-column", ColumnarDataProvider.settings)
+    def dataset_column_dataprovider(self, dataset: "DatasetInstance", **settings) -> DatasetColumnarDataProvider:
         settings["comment_char"] = "@"
         return super().dataset_column_dataprovider(dataset, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("dict", dataproviders.column.DictDataProvider.settings)
-    def dict_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("dict", DictDataProvider.settings)
+    def dict_dataprovider(self, dataset: "DatasetInstance", **settings) -> DictDataProvider:
         settings["comment_char"] = "@"
         return super().dict_dataprovider(dataset, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("dataset-dict", dataproviders.column.DictDataProvider.settings)
-    def dataset_dict_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("dataset-dict", DictDataProvider.settings)
+    def dataset_dict_dataprovider(self, dataset: "DatasetInstance", **settings) -> DatasetDictDataProvider:
         settings["comment_char"] = "@"
         return super().dataset_dict_dataprovider(dataset, **settings)
 
-    @dataproviders.decorators.dataprovider_factory("header", dataproviders.line.RegexLineDataProvider.settings)
-    def header_dataprovider(self, dataset, **settings):
-        dataset_source = dataproviders.dataset.DatasetDataProvider(dataset)
-        headers_source = dataproviders.line.RegexLineDataProvider(dataset_source, regex_list=["^@"])
-        return dataproviders.line.RegexLineDataProvider(headers_source, **settings)
+    @dataproviders.decorators.dataprovider_factory("header", RegexLineDataProvider.settings)
+    def header_dataprovider(self, dataset: "DatasetInstance", **settings) -> RegexLineDataProvider:
+        dataset_source = DatasetDataProvider(dataset)
+        headers_source = RegexLineDataProvider(dataset_source, regex_list=["^@"])
+        return RegexLineDataProvider(headers_source, **settings)
 
     @dataproviders.decorators.dataprovider_factory("id-seq-qual", dict_dataprovider.settings)
-    def id_seq_qual_dataprovider(self, dataset, **settings):
+    def id_seq_qual_dataprovider(self, dataset: "DatasetInstance", **settings) -> DictDataProvider:
         # provided as an example of a specified column dict (w/o metadata)
         settings["indeces"] = [0, 9, 10]
         settings["column_names"] = ["id", "seq", "qual"]
         return self.dict_dataprovider(dataset, **settings)
 
-    @dataproviders.decorators.dataprovider_factory(
-        "genomic-region", dataproviders.dataset.GenomicRegionDataProvider.settings
-    )
-    def genomic_region_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("genomic-region", GenomicRegionDataProvider.settings)
+    def genomic_region_dataprovider(self, dataset: "DatasetInstance", **settings) -> GenomicRegionDataProvider:
         settings["comment_char"] = "@"
-        return dataproviders.dataset.GenomicRegionDataProvider(dataset, 2, 3, 3, **settings)
+        return GenomicRegionDataProvider(dataset, 2, 3, 3, **settings)
 
-    @dataproviders.decorators.dataprovider_factory(
-        "genomic-region-dict", dataproviders.dataset.GenomicRegionDataProvider.settings
-    )
-    def genomic_region_dict_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("genomic-region-dict", GenomicRegionDataProvider.settings)
+    def genomic_region_dict_dataprovider(self, dataset: "DatasetInstance", **settings) -> GenomicRegionDataProvider:
         settings["comment_char"] = "@"
-        return dataproviders.dataset.GenomicRegionDataProvider(dataset, 2, 3, 3, True, **settings)
+        return GenomicRegionDataProvider(dataset, 2, 3, 3, True, **settings)
 
     # @dataproviders.decorators.dataprovider_factory( 'samtools' )
     # def samtools_dataprovider( self, dataset, **settings ):
@@ -855,20 +937,16 @@ class Pileup(Tabular):
     MetadataElement(name="endCol", default=2, desc="End column", param=metadata.ColumnParameter)
     MetadataElement(name="baseCol", default=3, desc="Reference base column", param=metadata.ColumnParameter)
 
-    def init_meta(self, dataset, copy_from=None):
+    def init_meta(self, dataset: "DatasetInstance", copy_from: Optional["DatasetInstance"] = None) -> None:
         super().init_meta(dataset, copy_from=copy_from)
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Returns formated html of peek"""
         return self.make_html_table(
             dataset, column_parameter_alias={"chromCol": "Chrom", "startCol": "Start", "baseCol": "Base"}
         )
 
-    def repair_methods(self, dataset):
-        """Return options for removing errors along with a description"""
-        return [("lines", "Remove erroneous lines")]
-
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Checks for 'pileup-ness'
 
@@ -914,16 +992,12 @@ class Pileup(Tabular):
         return found_non_comment_lines
 
     # Dataproviders
-    @dataproviders.decorators.dataprovider_factory(
-        "genomic-region", dataproviders.dataset.GenomicRegionDataProvider.settings
-    )
-    def genomic_region_dataprovider(self, dataset, **settings):
-        return dataproviders.dataset.GenomicRegionDataProvider(dataset, **settings)
+    @dataproviders.decorators.dataprovider_factory("genomic-region", GenomicRegionDataProvider.settings)
+    def genomic_region_dataprovider(self, dataset: "DatasetInstance", **settings) -> GenomicRegionDataProvider:
+        return GenomicRegionDataProvider(dataset, **settings)
 
-    @dataproviders.decorators.dataprovider_factory(
-        "genomic-region-dict", dataproviders.dataset.GenomicRegionDataProvider.settings
-    )
-    def genomic_region_dict_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("genomic-region-dict", GenomicRegionDataProvider.settings)
+    def genomic_region_dict_dataprovider(self, dataset: "DatasetInstance", **settings) -> GenomicRegionDataProvider:
         settings["named_columns"] = True
         return self.genomic_region_dataprovider(dataset, **settings)
 
@@ -961,19 +1035,19 @@ class BaseVcf(Tabular):
         name="sample_names", default=[], desc="Sample names", readonly=True, visible=False, optional=True, no_value=[]
     )
 
-    def _sniff(self, fname_or_file_prefix):
+    def _sniff(self, fname_or_file_prefix: Union[str, FilePrefix]) -> bool:
         # Because this sniffer is run on compressed files that might be BGZF (due to the VcfGz subclass), we should
         # handle unicode decode errors. This should ultimately be done in get_headers(), but guess_ext() currently
         # relies on get_headers() raising this exception.
         headers = get_headers(fname_or_file_prefix, "\n", count=1)
         return headers[0][0].startswith("##fileformat=VCF")
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         """Returns formated html of peek"""
         return self.make_html_table(dataset, column_names=self.column_names)
 
-    def set_meta(self, dataset, **kwd):
-        super().set_meta(dataset, **kwd)
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
         line = None
         with compression_utils.get_fileobj(dataset.file_name) as fh:
             # Skip comments.
@@ -986,7 +1060,7 @@ class BaseVcf(Tabular):
             dataset.metadata.sample_names = line.split()[9:]
 
     @staticmethod
-    def merge(split_files, output_file):
+    def merge(split_files: List[str], output_file: str) -> None:
         stderr_f = tempfile.NamedTemporaryFile(prefix="bam_merge_stderr")
         stderr_name = stderr_f.name
         command = ["bcftools", "concat"] + split_files + ["-o", output_file]
@@ -996,27 +1070,23 @@ class BaseVcf(Tabular):
             stderr = f.read().strip()
         # Did merge succeed?
         if exit_code != 0:
-            raise Exception(f"Error merging VCF files: {stderr}")
+            raise Exception(f"Error merging VCF files: {stderr!r}")
 
-    def validate(self, dataset, **kwd):
+    def validate(self, dataset: "DatasetInstance", **kwd) -> DatatypeValidation:
         def validate_row(row):
             if len(row) < 8:
                 raise Exception("Not enough columns in row %s" % row.join("\t"))
 
         validate_tabular(dataset.file_name, sep="\t", validate_row=validate_row, comment_designator="#")
-        return data.DatatypeValidation.validated()
+        return DatatypeValidation.validated()
 
     # Dataproviders
-    @dataproviders.decorators.dataprovider_factory(
-        "genomic-region", dataproviders.dataset.GenomicRegionDataProvider.settings
-    )
-    def genomic_region_dataprovider(self, dataset, **settings):
-        return dataproviders.dataset.GenomicRegionDataProvider(dataset, 0, 1, 1, **settings)
+    @dataproviders.decorators.dataprovider_factory("genomic-region", GenomicRegionDataProvider.settings)
+    def genomic_region_dataprovider(self, dataset: "DatasetInstance", **settings) -> GenomicRegionDataProvider:
+        return GenomicRegionDataProvider(dataset, 0, 1, 1, **settings)
 
-    @dataproviders.decorators.dataprovider_factory(
-        "genomic-region-dict", dataproviders.dataset.GenomicRegionDataProvider.settings
-    )
-    def genomic_region_dict_dataprovider(self, dataset, **settings):
+    @dataproviders.decorators.dataprovider_factory("genomic-region-dict", GenomicRegionDataProvider.settings)
+    def genomic_region_dict_dataprovider(self, dataset: "DatasetInstance", **settings) -> GenomicRegionDataProvider:
         settings["named_columns"] = True
         return self.genomic_region_dataprovider(dataset, **settings)
 
@@ -1024,7 +1094,7 @@ class BaseVcf(Tabular):
 class Vcf(BaseVcf):
     file_ext = "vcf"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         return self._sniff(file_prefix)
 
 
@@ -1045,7 +1115,7 @@ class VcfGz(BaseVcf, binary.Binary):
         optional=True,
     )
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         if not self._sniff(filename):
             return False
         # Check that the file is compressed with bgzip (not gzip), i.e. the
@@ -1056,8 +1126,10 @@ class VcfGz(BaseVcf, binary.Binary):
             last28 = fh.read()
             return binascii.hexlify(last28) == b"1f8b08040000000000ff0600424302001b0003000000000000000000"
 
-    def set_meta(self, dataset, metadata_tmp_files_dir=None, **kwd):
-        super().set_meta(dataset, **kwd)
+    def set_meta(
+        self, dataset: "DatasetInstance", overwrite: bool = True, metadata_tmp_files_dir: Optional[str] = None, **kwd
+    ) -> None:
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
         # Creates the index for the VCF file.
         # These metadata values are not accessible by users, always overwrite
         index_file = dataset.metadata.tabix_index
@@ -1157,12 +1229,13 @@ class Eland(Tabular):
             "FILT",
         ]
 
-    def make_html_table(self, dataset, skipchars=None, peek=None):
+    def make_html_table(
+        self, dataset: "DatasetInstance", skipchars: Optional[List] = None, peek: Optional[List] = None, **kwargs
+    ) -> str:
         """Create HTML table, used for displaying peek"""
-        if skipchars is None:
-            skipchars = []
-        out = ['<table cellspacing="0" cellpadding="3">']
+        skipchars = skipchars or []
         try:
+            out = ['<table cellspacing="0" cellpadding="3">']
             # Generate column header
             out.append("<tr>")
             for i, name in enumerate(self.column_names):
@@ -1174,12 +1247,11 @@ class Eland(Tabular):
                 out.append("</tr>")
             out.append(self.make_html_peek_rows(dataset, skipchars=skipchars, peek=peek))
             out.append("</table>")
-            out = "".join(out)
+            return "".join(out)
         except Exception as exc:
-            out = f"Can't create peek {exc}"
-        return out
+            return f"Can't create peek {exc}"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in ELAND export format
 
@@ -1215,10 +1287,19 @@ class Eland(Tabular):
                     break
         if count > 0:
             return True
+        return False
 
-    def set_meta(self, dataset, overwrite=True, skip=None, max_data_lines=5, **kwd):
+    def set_meta(
+        self,
+        dataset: "DatasetInstance",
+        overwrite: bool = True,
+        skip: Optional[int] = None,
+        max_data_lines: Optional[int] = 5,
+        **kwd,
+    ) -> None:
         if dataset.has_data():
             with compression_utils.get_fileobj(dataset.file_name, compressed_formats=["gzip"]) as dataset_fh:
+                dataset_fh = cast(FileObjTypeStr, dataset_fh)
                 lanes = {}
                 tiles = {}
                 barcodes = {}
@@ -1276,7 +1357,7 @@ class Eland(Tabular):
 class ElandMulti(Tabular):
     file_ext = "elandmulti"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         return False
 
 
@@ -1320,37 +1401,7 @@ class BaseCSV(TabularData):
     peek_size = 1024  # File chunk used for sniffing CSV dialect
     big_peek_size = 10240  # Large File chunk used for sniffing CSV dialect
 
-    def is_int(self, column_text):
-        # Don't allow underscores in numeric literals (PEP 515)
-        if "_" in column_text:
-            return False
-        try:
-            int(column_text)
-            return True
-        except ValueError:
-            return False
-
-    def is_float(self, column_text):
-        # Don't allow underscores in numeric literals (PEP 515)
-        if "_" in column_text:
-            return False
-        try:
-            float(column_text)
-            return True
-        except ValueError:
-            if column_text.strip().lower() == "na":
-                return True  # na is special cased to be a float
-            return False
-
-    def guess_type(self, text):
-        if self.is_int(text):
-            return "int"
-        if self.is_float(text):
-            return "float"
-        else:
-            return "str"
-
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """Return True if if recognizes dialect and header."""
         # check the dialect works
         with open(filename, newline="") as f:
@@ -1402,7 +1453,7 @@ class BaseCSV(TabularData):
             return False
         return True
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         column_types = []
         header_row = []
         data_row = []
@@ -1484,7 +1535,7 @@ class ConnectivityTable(Tabular):
         self.column_names = ["base_index", "base", "neighbor_left", "neighbor_right", "partner", "natural_numbering"]
         self.column_types = ["int", "str", "int", "int", "int", "int"]
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         data_lines = 0
 
         with open(dataset.file_name) as fh:
@@ -1493,7 +1544,7 @@ class ConnectivityTable(Tabular):
 
         dataset.metadata.data_lines = data_lines
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         The ConnectivityTable (CT) is a file format used for describing
         RNA 2D structures by tools including MFOLD, UNAFOLD and
@@ -1614,10 +1665,17 @@ class MatrixMarket(TabularData):
     def __init__(self, **kwd):
         super().__init__(**kwd)
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         return file_prefix.startswith("%%MatrixMarket matrix coordinate")
 
-    def set_meta(self, dataset, overwrite=True, skip=None, max_data_lines=5, **kwd):
+    def set_meta(
+        self,
+        dataset: "DatasetInstance",
+        overwrite: bool = True,
+        skip: Optional[int] = None,
+        max_data_lines: Optional[int] = 5,
+        **kwd,
+    ) -> None:
         if dataset.has_data():
             # If the dataset is larger than optional_metadata, just count comment lines.
             with open(dataset.file_name) as dataset_fh:
@@ -1633,7 +1691,7 @@ class MatrixMarket(TabularData):
                     if line.startswith("%"):
                         comment_lines += 1
                     elif count_comments_only:
-                        data_lines = None
+                        data_lines = None  # type: ignore [assignment]
                         break
                     else:
                         data_lines += 1
@@ -1729,7 +1787,7 @@ class CMAP(TabularData):
         no_value=[],
     )
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         handle = file_prefix.string_io()
         for line in handle:
             if not line.startswith("#"):
@@ -1738,7 +1796,14 @@ class CMAP(TabularData):
                 return True
         return False
 
-    def set_meta(self, dataset, overwrite=True, skip=None, max_data_lines=7, **kwd):
+    def set_meta(
+        self,
+        dataset: "DatasetInstance",
+        overwrite: bool = True,
+        skip: Optional[int] = None,
+        max_data_lines: Optional[int] = 7,
+        **kwd,
+    ) -> None:
         if dataset.has_data():
             with open(dataset.file_name) as dataset_fh:
                 comment_lines = 0
@@ -1798,3 +1863,124 @@ class CMAP(TabularData):
             dataset.metadata.column_types = cleaned_column_types
             dataset.metadata.columns = number_of_columns
             dataset.metadata.delimiter = "\t"
+
+
+@build_sniff_from_prefix
+class Psl(Tabular):
+    """Tab delimited data in psl format."""
+
+    edam_format = "format_3007"
+    file_ext = "psl"
+    line_class = "assemblies"
+    data_sources = {"data": "tabix"}
+
+    def __init__(self, **kwd):
+        """Initialize psl datatype"""
+        super().__init__(**kwd)
+        self.column_names = [
+            "matches",
+            "misMatches",
+            "repMatches",
+            "nCount",
+            "qNumInsert",
+            "qBaseInsert",
+            "tNumInsert",
+            "tBaseInsert",
+            "strand",
+            "qName",
+            "qSize",
+            "qStart",
+            "qEnd",
+            "tName",
+            "tSize",
+            "tStart",
+            "tEnd",
+            "blockCount",
+            "blockSizes",
+            "qStarts",
+            "tStarts",
+        ]
+
+    def sniff_prefix(self, file_prefix: FilePrefix):
+        """
+        PSL lines represent alignments, and are typically generated
+        by BLAT. Each line consists of 21 required fields, and track
+        lines may optionally be used to provide more information.
+
+        Fields are tab-separated, and all 21 are required.
+        Although not part of the formal PSL specification, track lines
+        may be used to further configure sets of features.  Track lines
+        are placed at the beginning of the list of features they are
+        to affect.
+
+        Rules for sniffing as True::
+
+            - There must be 21 columns on each fields line
+            - matches, misMatches repMatches, nCount, qNumInsert,
+              qBaseInsert, tNumInsert, tBaseInsert, strand, qSize, qStart,
+              qEnd, tName, tSize, tStart, tEnd, blockCount, blockSizes,
+              qStarts, tStarts  must be correct
+            - We will only check that up to the first 10 alignments are
+              correctly formatted.
+        >>> from galaxy.datatypes.sniff import get_test_fname
+        >>> fname = get_test_fname( '1.psl' )
+        >>> Psl().sniff( fname )
+        True
+        >>> fname = get_test_fname( '2.psl' )
+        >>> Psl().sniff( fname )
+        True
+        >>> fname = get_test_fname( 'interval.interval' )
+        >>> Psl().sniff( fname )
+        False
+        >>> fname = get_test_fname( '2.txt' )
+        >>> Psl().sniff( fname )
+        False
+        >>> fname = get_test_fname( 'test_tab2.tabular' )
+        >>> Psl().sniff( fname )
+        False
+        >>> fname = get_test_fname( 'mothur_datatypetest_true.mothur.ref.taxonomy' )
+        >>> Psl().sniff( fname )
+        False
+        """
+
+        def check_items(s):
+            s_items = s.split(",")
+            for item in s_items:
+                if int(item) < 0:
+                    raise Exception("Out of range")
+
+        count = 0
+        for line in file_prefix.line_iterator():
+            line = line.strip()
+            if not line:
+                break
+            if line:
+                if line.startswith("browser") or line.startswith("track"):
+                    # Skip track lines.
+                    continue
+                items = line.split("\t")
+                if len(items) != 21:
+                    return False
+                # tName is a string
+                items.pop(13)
+                # qName is a string
+                items.pop(9)
+                # strand
+                if items.pop(8) not in ["-", "+", "+-", "-+"]:
+                    raise Exception("Invalid strand")
+                # blockSizes
+                s = items.pop(15).rstrip(",")
+                check_items(s)
+                # qStarts
+                s = items.pop(15).rstrip(",")
+                check_items(s)
+                # tStarts
+                s = items.pop(15).rstrip(",")
+                check_items(s)
+                if any(int(item) < 0 for item in items):
+                    raise Exception("Out of range")
+                count += 1
+                if count == 10:
+                    break
+        if count > 0:
+            return True
diff --git a/lib/galaxy/datatypes/test/1.h5mlm b/lib/galaxy/datatypes/test/1.h5mlm
index b4b826ff08d..d0481e40c9a 100644
Binary files a/lib/galaxy/datatypes/test/1.h5mlm and b/lib/galaxy/datatypes/test/1.h5mlm differ
diff --git a/lib/galaxy/datatypes/test/1.psl b/lib/galaxy/datatypes/test/1.psl
new file mode 100644
index 00000000000..c67415a6c1a
--- /dev/null
+++ b/lib/galaxy/datatypes/test/1.psl
@@ -0,0 +1,6 @@
+browser position chr22:13073000-13074000
+browser hide all
+track name=fishBlats description="Fish BLAT" visibility=2 useScore=1
+59	9	0	0	1	823	1	96	+-	FS_CONTIG_48080_1	1955	171	1062	chr22	47748585	13073589	13073753	2	48,20,	171,1042,	34674832,34674976,
+59	7	0	0	1	55	1	55	+-	FS_CONTIG_26780_1	2825	2456	2577	chr22	47748585	13073626	13073747	2	21,45,	2456,2532,	34674838,34674914,
+59	7	0	0	1	55	1	55	-+	FS_CONTIG_26780_1	2825	2455	2676	chr22	47748585	13073727	13073848	2	45,21,	249,349,	13073727,13073827
diff --git a/lib/galaxy/datatypes/test/2.psl b/lib/galaxy/datatypes/test/2.psl
new file mode 100644
index 00000000000..d95570c67ef
--- /dev/null
+++ b/lib/galaxy/datatypes/test/2.psl
@@ -0,0 +1,5 @@
+2890	41	0	0	25	41	25	32	+	NZ_CP026740.1	98205	66320	69251	PS02056|SAMN29228906_5	3054	125	3047	51	72,57,4,9,13,13,86,4,44,4,19,2,1,52,7,8,4,181,108,189,50,41,3,231,2,3,19,3,5,61,136,1,8,30,18,1,42,26,55,119,2,380,3,109,5,566,2,2,45,11,34,	66320,66392,66449,66454,66464,66477,66490,66577,66581,66626,66630,66649,66653,66654,66706,66714,66723,66727,66908,67016,67206,67257,67298,67303,67540,67542,67545,67565,67569,67574,67635,67771,67774,67782,67813,67832,67834,67877,67903,67959,68079,68081,68462,68465,68575,68580,69154,69157,69159,69206,69217,	125,198,256,260,269,283,297,383,388,432,437,457,459,461,514,521,529,534,716,826,1015,1065,1108,1111,1342,1346,1351,1370,1373,1380,1442,1579,1580,1589,1619,1637,1638,1680,1708,1763,1882,1885,2265,2269,2378,2384,2950,2952,2955,3000,3013,
+1513	16	0	0	12	16	14	20	-	NZ_CP026740.1	98205	32103	33632	PS02056|SAMN29228906_6	1548	13	1546	27	94,6,159,153,17,2,74,7,6,28,147,6,1,7,202,4,3,164,1,1,2,276,3,83,4,21,42,	32103,32197,32203,32362,32515,32532,32535,32609,32618,32626,32654,32802,32808,32810,32818,33020,33026,33030,33194,33195,33197,33201,33477,33481,33565,33569,33590,	13,108,115,275,430,448,450,525,532,538,567,714,723,724,731,935,939,942,1107,1110,1111,1113,1390,1393,1476,1482,1504,
+762	108	0	0	14	108	13	132	+	NZ_CP026740.1	98205	69627	70497	PS02056|SAMN29228906_3	6215	1049	1943	28	81,1,45,4,35,2,66,1,2,99,41,2,5,4,40,76,3,3,72,4,3,2,7,71,5,11,3,74,	69627,69711,69713,69758,69762,69797,69799,69865,69868,69870,69969,70011,70014,70019,70023,70073,70150,70153,70157,70295,70304,70311,70314,70332,70404,70409,70420,70423,	1049,1130,1131,1177,1182,1218,1321,1388,1389,1392,1492,1533,1535,1543,1548,1588,1664,1669,1672,1744,1748,1751,1753,1760,1831,1837,1857,1869,
+77	0	0	0	0	0	0	0	+	NZ_CP026740.1	98205	70504	70581	PS02056|SAMN29228906_3	6215	134	211	1	77,	70504,	134,
+2890	41	0	0	25	41	25	32	+	CP026740.1	98205	66320	69251	PS02056|SAMN29228906_5	3054	125	3047	51	72,57,4,9,13,13,86,4,44,4,19,2,1,52,7,8,4,181,108,189,50,41,3,231,2,3,19,3,5,61,136,1,8,30,18,1,42,26,55,119,2,380,3,109,5,566,2,2,45,11,34,	66320,66392,66449,66454,66464,66477,66490,66577,66581,66626,66630,66649,66653,66654,66706,66714,66723,66727,66908,67016,67206,67257,67298,67303,67540,67542,67545,67565,67569,67574,67635,67771,67774,67782,67813,67832,67834,67877,67903,67959,68079,68081,68462,68465,68575,68580,69154,69157,69159,69206,69217,	125,198,256,260,269,283,297,383,388,432,437,457,459,461,514,521,529,534,716,826,1015,1065,1108,1111,1342,1346,1351,1370,1373,1380,1442,1579,1580,1589,1619,1637,1638,1680,1708,1763,1882,1885,2265,2269,2378,2384,2950,2952,2955,3000,3013,
diff --git a/lib/galaxy/datatypes/test/some.wiff2.tar b/lib/galaxy/datatypes/test/some.wiff2.tar
new file mode 100644
index 00000000000..afc936207a9
Binary files /dev/null and b/lib/galaxy/datatypes/test/some.wiff2.tar differ
diff --git a/lib/galaxy/datatypes/text.py b/lib/galaxy/datatypes/text.py
index d4cb97e07f1..28fe2fa8964 100644
--- a/lib/galaxy/datatypes/text.py
+++ b/lib/galaxy/datatypes/text.py
@@ -8,10 +8,17 @@ import os
 import re
 import subprocess
 import tempfile
+from typing import (
+    IO,
+    Optional,
+    Tuple,
+    TYPE_CHECKING,
+)
 
 import yaml
 
 from galaxy.datatypes.data import (
+    GeneratePrimaryFileDataset,
     get_file_peek,
     Headers,
     Text,
@@ -32,6 +39,12 @@ from galaxy.util import (
     unicodify,
 )
 
+if TYPE_CHECKING:
+    from galaxy.model import (
+        DatasetInstance,
+        HistoryDatasetAssociation,
+    )
+
 log = logging.getLogger(__name__)
 
 
@@ -42,7 +55,7 @@ class Html(Text):
     edam_format = "format_2331"
     file_ext = "html"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "HTML file"
             dataset.blurb = nice_size(dataset.get_size())
@@ -50,11 +63,11 @@ class Html(Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Returns the mime type of the datatype"""
         return "text/html"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in html format
 
@@ -78,7 +91,7 @@ class Json(Text):
     edam_format = "format_3464"
     file_ext = "json"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             dataset.blurb = "JavaScript Object Notation (JSON)"
@@ -86,17 +99,17 @@ class Json(Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disc"
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Returns the mime type of the datatype"""
         return "application/json"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to load the string with the json module. If successful it's a json file.
         """
         return self._looks_like_json(file_prefix)
 
-    def _looks_like_json(self, file_prefix):
+    def _looks_like_json(self, file_prefix: FilePrefix) -> bool:
         # Pattern used by SequenceSplitLocations
         if file_prefix.file_size < 50000 and not file_prefix.truncated:
             # If the file is small enough - don't guess just check.
@@ -115,7 +128,7 @@ class Json(Text):
                 return start.startswith("[") or start.startswith("{")
             return False
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
@@ -130,7 +143,7 @@ class ExpressionJson(Json):
         name="json_type", default=None, desc="JavaScript or JSON type of expression", readonly=True, visible=True
     )
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """ """
         if dataset.has_data():
             json_type = "null"
@@ -157,7 +170,7 @@ class ExpressionJson(Json):
 class Ipynb(Json):
     file_ext = "ipynb"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             dataset.blurb = "Jupyter Notebook"
@@ -165,7 +178,7 @@ class Ipynb(Json):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disc"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to load the string with the json module. If successful it's a json file.
         """
@@ -179,8 +192,17 @@ class Ipynb(Json):
                     return False
             except Exception:
                 return False
+        return False
 
-    def display_data(self, trans, dataset, preview=False, filename=None, to_ext=None, **kwd):
+    def display_data(
+        self,
+        trans,
+        dataset: "HistoryDatasetAssociation",
+        preview: bool = False,
+        filename: Optional[str] = None,
+        to_ext: Optional[str] = None,
+        **kwd,
+    ):
         headers = kwd.get("headers", {})
         config = trans.app.config
         trust = getattr(config, "trust_jupyter_notebook_conversion", False)
@@ -193,7 +215,15 @@ class Ipynb(Json):
                 trans, dataset, preview=preview, filename=filename, to_ext=to_ext, headers=headers, **kwd
             )
 
-    def _display_data_trusted(self, trans, dataset, preview=False, filename=None, to_ext=None, **kwd):
+    def _display_data_trusted(
+        self,
+        trans,
+        dataset: "HistoryDatasetAssociation",
+        preview: bool = False,
+        filename: Optional[str] = None,
+        to_ext: Optional[str] = None,
+        **kwd,
+    ) -> Tuple[IO, Headers]:
         headers = kwd.get("headers", {})
         preview = string_as_bool(preview)
         if to_ext or not preview:
@@ -223,7 +253,7 @@ class Ipynb(Json):
                 )
             return open(ofilename, mode="rb"), headers
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Set the number of models in dataset.
         """
@@ -359,18 +389,18 @@ class Biom1(Json):
         no_value=[],
     )
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         super().set_peek(dataset)
         if not dataset.dataset.purged:
             dataset.blurb = "Biological Observation Matrix v1"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         is_biom = False
         if self._looks_like_json(file_prefix):
             is_biom = self._looks_like_biom(file_prefix)
         return is_biom
 
-    def _looks_like_biom(self, file_prefix: FilePrefix, load_size=50000):
+    def _looks_like_biom(self, file_prefix: FilePrefix, load_size: int = 50000) -> bool:
         """
         @param filepath: [str] The path to the evaluated file.
         @param load_size: [int] The size of the file block load in RAM (in
@@ -396,7 +426,7 @@ class Biom1(Json):
             pass
         return is_biom
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Store metadata information from the BIOM file.
         """
@@ -458,12 +488,12 @@ class ImgtJson(Json):
 
     MetadataElement(name="taxon_names", default=[], desc="taxonID: names", readonly=True, visible=True, no_value=[])
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         super().set_peek(dataset)
         if not dataset.dataset.purged:
             dataset.blurb = "IMGT Library"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in json format with imgt elements
 
@@ -480,7 +510,7 @@ class ImgtJson(Json):
             is_imgt = self._looks_like_imgt(file_prefix)
         return is_imgt
 
-    def _looks_like_imgt(self, file_prefix: FilePrefix, load_size=5000):
+    def _looks_like_imgt(self, file_prefix: FilePrefix, load_size: int = 5000) -> bool:
         """
         @param filepath: [str] The path to the evaluated file.
         @param load_size: [int] The size of the file block load in RAM (in
@@ -497,7 +527,7 @@ class ImgtJson(Json):
             pass
         return is_imgt
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Store metadata information from the imgt file.
         """
@@ -524,12 +554,12 @@ class GeoJson(Json):
 
     file_ext = "geojson"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         super().set_peek(dataset)
         if not dataset.dataset.purged:
             dataset.blurb = "GeoJSON"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in json format with imgt elements
 
@@ -546,7 +576,7 @@ class GeoJson(Json):
             is_geojson = self._looks_like_geojson(file_prefix)
         return is_geojson
 
-    def _looks_like_geojson(self, file_prefix: FilePrefix, load_size=5000):
+    def _looks_like_geojson(self, file_prefix: FilePrefix, load_size: int = 5000) -> bool:
         """
         One of "Point", "MultiPoint", "LineString", "MultiLineString", "Polygon", "MultiPolygon", and "GeometryCollection" needs to be present.
         All of "type", "geometry", and "coordinates" needs to be present.
@@ -585,7 +615,7 @@ class Obo(Text):
     edam_format = "format_2549"
     file_ext = "obo"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             dataset.blurb = "Open Biomedical Ontology (OBO)"
@@ -593,7 +623,7 @@ class Obo(Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disc"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess the Obo filetype.
         It usually starts with a "format-version:" string and has several stanzas which starts with "id:".
@@ -627,7 +657,7 @@ class Arff(Text):
     )
     MetadataElement(name="columns", default=0, desc="Number of columns", readonly=True, visible=True, no_value=0)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = get_file_peek(dataset.file_name)
             dataset.blurb = "Attribute-Relation File Format (ARFF)"
@@ -636,7 +666,7 @@ class Arff(Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disc"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to guess the Arff filetype.
         It usually starts with a "format-version:" string and has several stanzas which starts with "id:".
@@ -663,7 +693,7 @@ class Arff(Text):
                     return True
         return False
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         """
         Trying to count the comment lines and the number of columns included.
         A typical ARFF data block looks like this:
@@ -735,7 +765,7 @@ class SnpEffDb(Text):
         super().__init__(**kwd)
 
     # The SnpEff version line was added in SnpEff version 4.1
-    def getSnpeffVersionFromFile(self, path):
+    def getSnpeffVersionFromFile(self, path: str) -> Optional[str]:
         snpeff_version = None
         try:
             with gzip.open(path, "rt") as fh:
@@ -748,8 +778,8 @@ class SnpEffDb(Text):
             pass
         return snpeff_version
 
-    def set_meta(self, dataset, **kwd):
-        super().set_meta(dataset, **kwd)
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
+        super().set_meta(dataset, overwrite=overwrite, **kwd)
         data_dir = dataset.extra_files_path
         # search data_dir/genome_version for files
         regulation_pattern = "regulation_(.+).bin"
@@ -834,14 +864,14 @@ class SnpSiftDbNSFP(Text):
             "%s.gz.tbi", description="Tabix Index File", substitute_name_with_metadata="reference_name", is_binary=True
         )
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         """
         This is called only at upload to write the html file
         cannot rename the datasets here - they come with the default unfortunately
         """
         return "<html><head><title>SnpSiftDbNSFP Composite Dataset</title></head></html>"
 
-    def regenerate_primary_file(self, dataset):
+    def regenerate_primary_file(self, dataset: "DatasetInstance") -> None:
         """
         cannot do this until we are setting metadata
         """
@@ -853,7 +883,7 @@ class SnpSiftDbNSFP(Text):
                 f.write("\n")
             f.write(annotations)
 
-    def set_meta(self, dataset, overwrite=True, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         try:
             efp = dataset.extra_files_path
             if os.path.exists(efp):
@@ -879,7 +909,7 @@ class SnpSiftDbNSFP(Text):
                 unicodify(e),
             )
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = f"{dataset.metadata.reference_name} :  {','.join(dataset.metadata.annotation)}"
             dataset.blurb = f"{dataset.metadata.reference_name}"
@@ -894,7 +924,7 @@ class IQTree(Text):
 
     file_ext = "iqtree"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Detect the IQTree file
 
@@ -927,7 +957,7 @@ class Paf(Text):
 
     file_ext = "paf"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         >>> from galaxy.datatypes.sniff import get_test_fname
         >>> fname = get_test_fname('A-3105.paf')
@@ -962,7 +992,7 @@ class Gfa1(Text):
 
     file_ext = "gfa1"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         >>> from galaxy.datatypes.sniff import get_test_fname
         >>> fname = get_test_fname('big.gfa1')
@@ -1012,7 +1042,7 @@ class Gfa2(Text):
 
     file_ext = "gfa2"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         >>> from galaxy.datatypes.sniff import get_test_fname
         >>> fname = get_test_fname('sample.gfa2')
@@ -1054,24 +1084,24 @@ class Yaml(Text):
 
     file_ext = "yaml"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Try to load the string with the yaml module. If successful it's a yaml file.
         """
         return self._looks_like_yaml(file_prefix)
 
-    def get_mime(self):
+    def get_mime(self) -> str:
         """Returns the mime type of the datatype"""
         return "application/yaml"
 
-    def _yield_user_file_content(self, trans, from_dataset, filename, headers: Headers):
+    def _yield_user_file_content(self, trans, from_dataset: "DatasetInstance", filename: str, headers: Headers) -> IO:
         # Override non-standard application/yaml mediatype with
         # text/plain, so preview is shown in preview iframe,
         # instead of downloading the file.
         headers["content-type"] = "text/plain"
         return super()._yield_user_file_content(trans, from_dataset, filename, headers)
 
-    def _looks_like_yaml(self, file_prefix: FilePrefix):
+    def _looks_like_yaml(self, file_prefix: FilePrefix) -> bool:
         # Pattern used by SequenceSplitLocations
         if file_prefix.file_size < 50000 and not file_prefix.truncated:
             # If the file is small enough - don't guess just check.
@@ -1099,7 +1129,7 @@ class BCSLmodel(Text):
 
     file_ext = "bcsl.model"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in .bcsl.model format
         """
@@ -1113,7 +1143,7 @@ class BCSLts(Json):
 
     file_ext = "bcsl.ts"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in .bcsl.ts format
         """
@@ -1122,18 +1152,18 @@ class BCSLts(Json):
             is_bcsl_ts = self._looks_like_bcsl_ts(file_prefix)
         return is_bcsl_ts
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             lines = "States: {}\nTransitions: {}\nUnique agents: {}\nInitial state: {}"
-            ts = json.load(open(dataset.file_name, "r"))
+            ts = json.load(open(dataset.file_name))
             dataset.peek = lines.format(len(ts["nodes"]), len(ts["edges"]), len(ts["ordering"]), ts["initial"])
             dataset.blurb = nice_size(dataset.get_size())
         else:
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def _looks_like_bcsl_ts(self, file_prefix: FilePrefix):
-        content = open(file_prefix.filename, "r").read()
+    def _looks_like_bcsl_ts(self, file_prefix: FilePrefix) -> bool:
+        content = open(file_prefix.filename).read()
         keywords = ['"edges":', '"nodes":', '"ordering":', '"initial":']
         if all(keyword in content for keyword in keywords):
             return self._looks_like_json(file_prefix)
@@ -1149,14 +1179,14 @@ class StormSample(Text):
 
     file_ext = "storm.sample"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in .storm.sample format
         """
         keywords = ["Storm-pars", "Result (initial states)"]
         return all(keyword in file_prefix.contents_header for keyword in keywords)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Storm-pars sample results."
             dataset.blurb = nice_size(dataset.get_size())
@@ -1174,22 +1204,22 @@ class StormCheck(Text):
 
     file_ext = "storm.check"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in .storm.check format
         """
         keywords = ["Storm ", "Result (for initial states)"]
         return all(keyword in file_prefix.contents_header for keyword in keywords)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
-            with open(dataset.file_name, "r") as result:
+            with open(dataset.file_name) as result:
                 answer = ""
                 for line in result:
                     if "Result (for initial states):" in line:
                         answer = line.split()[-1]
                         break
-            dataset.peek = "Model checking result: {}".format(answer)
+            dataset.peek = f"Model checking result: {answer}"
             dataset.blurb = nice_size(dataset.get_size())
         else:
             dataset.peek = "file does not exist"
@@ -1202,21 +1232,21 @@ class CTLresult(Text):
 
     file_ext = "ctl.result"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in .ctl.result format
         """
         keywords = ["Result:", "Number of satisfying states:"]
         return all(keyword in file_prefix.contents_header for keyword in keywords)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
-            with open(dataset.file_name, "r") as result:
+            with open(dataset.file_name) as result:
                 answer = ""
                 for line in result:
                     if "Result:" in line:
                         answer = line.split()[-1]
-            dataset.peek = "Model checking result: {}".format(answer)
+            dataset.peek = f"Model checking result: {answer}"
             dataset.blurb = nice_size(dataset.get_size())
         else:
             dataset.peek = "file does not exist"
@@ -1229,7 +1259,7 @@ class PithyaProperty(Text):
 
     file_ext = "pithya.property"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in .pithya.property format
         """
@@ -1242,7 +1272,7 @@ class PithyaModel(Text):
 
     file_ext = "pithya.model"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in .pithya.model format
         """
@@ -1256,7 +1286,7 @@ class PithyaResult(Json):
 
     file_ext = "pithya.result"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is in .pithya.result format
         """
@@ -1265,8 +1295,8 @@ class PithyaResult(Json):
             is_pithya_result = self._looks_like_pithya_result(file_prefix)
         return is_pithya_result
 
-    def _looks_like_pithya_result(self, file_prefix: FilePrefix):
-        content = open(file_prefix.filename, "r").read()
+    def _looks_like_pithya_result(self, file_prefix: FilePrefix) -> bool:
+        content = open(file_prefix.filename).read()
         keywords = ['"variables":', '"states":', '"parameter_values":', '"results":']
         if all(keyword in content for keyword in keywords):
             return self._looks_like_json(file_prefix)
@@ -1279,7 +1309,7 @@ class Castep(Text):
 
     file_ext = "castep"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """Determines whether the file is a CASTEP log
 
         >>> from galaxy.datatypes.sniff import get_test_fname
@@ -1314,7 +1344,7 @@ class Param(Yaml):
 
     file_ext = "param"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Modified version of the normal Yaml sniff that also checks
         for a valid CASTEP task key-value pair, which is not case
@@ -1361,7 +1391,7 @@ class FormattedDensity(Text):
 
     file_ext = "den_fmt"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """Determines whether the file contains electron densities in the CASTEP den_fmt format
 
         >>> from galaxy.datatypes.sniff import get_test_fname
diff --git a/lib/galaxy/datatypes/tracks.py b/lib/galaxy/datatypes/tracks.py
index 02fd0f50882..bf5e29e6b8c 100644
--- a/lib/galaxy/datatypes/tracks.py
+++ b/lib/galaxy/datatypes/tracks.py
@@ -2,10 +2,15 @@
 Datatype classes for tracks/track views within galaxy.
 """
 import logging
+from typing import TYPE_CHECKING
 
+from galaxy.datatypes.data import GeneratePrimaryFileDataset
 from galaxy.datatypes.text import Html
 from . import binary
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 
@@ -25,7 +30,7 @@ class UCSCTrackHub(Html):
     file_ext = "trackhub"
     composite_type = "auto_primary_file"
 
-    def generate_primary_file(self, dataset=None):
+    def generate_primary_file(self, dataset: GeneratePrimaryFileDataset) -> str:
         """
         This is called only at upload to write the html file
         cannot rename the datasets here - they come with the default unfortunately
@@ -43,18 +48,18 @@ class UCSCTrackHub(Html):
         rval.append("</ul></html>")
         return "\n".join(rval)
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = "Track Hub structure: Visualization in UCSC Track Hub"
         else:
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def display_peek(self, dataset):
+    def display_peek(self, dataset: "DatasetInstance") -> str:
         try:
             return dataset.peek
         except Exception:
             return "Track Hub structure: Visualization in UCSC Track Hub"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         return False
diff --git a/lib/galaxy/datatypes/triples.py b/lib/galaxy/datatypes/triples.py
index 711c71d92a3..debd78bb366 100644
--- a/lib/galaxy/datatypes/triples.py
+++ b/lib/galaxy/datatypes/triples.py
@@ -3,6 +3,7 @@ Triple format classes
 """
 import logging
 import re
+from typing import TYPE_CHECKING
 
 from galaxy.datatypes.sniff import (
     build_sniff_from_prefix,
@@ -15,6 +16,9 @@ from . import (
     xml,
 )
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 TURTLE_PREFIX_PATTERN = re.compile(r"@prefix\s+[^:]*:\s+<[^>]*>\s\.")
@@ -30,13 +34,13 @@ class Triples(data.Data):
     edam_format = "format_2376"
     file_ext = "triples"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """
         Returns false and the user must manually set.
         """
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -55,13 +59,13 @@ class NTriples(data.Text, Triples):
     edam_format = "format_3256"
     file_ext = "nt"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         # <http://example.org/dir/relfile> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/type> .
         if re.compile(r"<[^>]*>\s<[^>]*>\s<[^>]*>\s\.").search(file_prefix.contents_header):
             return True
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -79,13 +83,13 @@ class N3(data.Text, Triples):
     edam_format = "format_3257"
     file_ext = "n3"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         """
         Returns false and the user must manually set.
         """
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -104,7 +108,7 @@ class Turtle(data.Text, Triples):
     edam_format = "format_3255"
     file_ext = "ttl"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         # @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
         if file_prefix.search(TURTLE_PREFIX_PATTERN):
             return True
@@ -113,7 +117,7 @@ class Turtle(data.Text, Triples):
             return True
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -133,7 +137,7 @@ class Rdf(xml.GenericXml, Triples):
     edam_format = "format_3261"
     file_ext = "rdf"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         # <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" ...
         match = re.compile(r'xmlns:([^=]*)="http://www.w3.org/1999/02/22-rdf-syntax-ns#"').search(
             file_prefix.contents_header
@@ -142,7 +146,7 @@ class Rdf(xml.GenericXml, Triples):
             return True
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -162,13 +166,13 @@ class Jsonld(text.Json, Triples):
     edam_format = "format_3464"
     file_ext = "jsonld"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         if self._looks_like_json(file_prefix):
             if '"@id"' in file_prefix.contents_header or '"@context"' in file_prefix.contents_header:
                 return True
         return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -186,12 +190,13 @@ class HDT(binary.Binary, Triples):
     edam_format = "format_2376"
     file_ext = "hdt"
 
-    def sniff(self, filename):
+    def sniff(self, filename: str) -> bool:
         with open(filename, "rb") as f:
             if f.read(4) == b"$HDT":
                 return True
+        return False
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
diff --git a/lib/galaxy/datatypes/xml.py b/lib/galaxy/datatypes/xml.py
index a975d8ba761..00c1fe94ca0 100644
--- a/lib/galaxy/datatypes/xml.py
+++ b/lib/galaxy/datatypes/xml.py
@@ -3,8 +3,14 @@ XML format classes
 """
 import logging
 import re
+from typing import (
+    List,
+    TYPE_CHECKING,
+)
 
 from galaxy import util
+from galaxy.datatypes.dataproviders.dataset import DatasetDataProvider
+from galaxy.datatypes.dataproviders.hierarchy import XMLDataProvider
 from galaxy.datatypes.metadata import MetadataElement
 from galaxy.datatypes.sniff import (
     build_sniff_from_prefix,
@@ -16,6 +22,9 @@ from . import (
     dataproviders,
 )
 
+if TYPE_CHECKING:
+    from galaxy.model import DatasetInstance
+
 log = logging.getLogger(__name__)
 
 OWL_MARKER = re.compile(r"\<owl:")
@@ -30,7 +39,7 @@ class GenericXml(data.Text):
     edam_format = "format_2332"
     file_ext = "xml"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -39,7 +48,7 @@ class GenericXml(data.Text):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def _has_root_element_in_prefix(self, file_prefix: FilePrefix, root):
+    def _has_root_element_in_prefix(self, file_prefix: FilePrefix, root: str) -> bool:
         for line in file_prefix.line_iterator():
             if not line.startswith("<?"):
                 break
@@ -47,7 +56,7 @@ class GenericXml(data.Text):
         pattern = r"^<(\w*:)?%s" % root
         return re.match(pattern, line) is not None
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Determines whether the file is XML or not
 
@@ -62,7 +71,7 @@ class GenericXml(data.Text):
         return file_prefix.startswith("<?xml ")
 
     @staticmethod
-    def merge(split_files, output_file):
+    def merge(split_files: List[str], output_file: str) -> None:
         """Merging multiple XML files is non-trivial and must be done in subclasses."""
         if len(split_files) > 1:
             raise NotImplementedError(
@@ -71,10 +80,10 @@ class GenericXml(data.Text):
         # For one file only, use base class method (move/copy)
         data.Text.merge(split_files, output_file)
 
-    @dataproviders.decorators.dataprovider_factory("xml", dataproviders.hierarchy.XMLDataProvider.settings)
-    def xml_dataprovider(self, dataset, **settings):
-        dataset_source = dataproviders.dataset.DatasetDataProvider(dataset)
-        return dataproviders.hierarchy.XMLDataProvider(dataset_source, **settings)
+    @dataproviders.decorators.dataprovider_factory("xml", XMLDataProvider.settings)
+    def xml_dataprovider(self, dataset: "DatasetInstance", **settings) -> XMLDataProvider:
+        dataset_source = DatasetDataProvider(dataset)
+        return XMLDataProvider(dataset_source, **settings)
 
 
 @disable_parent_class_sniffing
@@ -83,7 +92,7 @@ class MEMEXml(GenericXml):
 
     file_ext = "memexml"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -99,7 +108,7 @@ class CisML(GenericXml):
 
     file_ext = "cisml"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -143,7 +152,7 @@ class Dzi(GenericXml):
     def __init__(self, **kwd):
         super().__init__(**kwd)
 
-    def set_meta(self, dataset, **kwd):
+    def set_meta(self, dataset: "DatasetInstance", overwrite: bool = True, **kwd) -> None:
         tree = util.parse_xml(dataset.file_name)
         root = tree.getroot()
         dataset.metadata.format = root.get("Format")
@@ -160,11 +169,7 @@ class Dzi(GenericXml):
                 dataset.metadata.width = elem.get("Width")
                 dataset.metadata.height = elem.get("Height")
 
-    def get_visualizations(self, dataset):
-        """Returns a list of visualizations for datatype"""
-        return ["openseadragon"]
-
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
             dataset.blurb = "Deep Zoom Image"
@@ -172,7 +177,7 @@ class Dzi(GenericXml):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disc"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Checking for keyword - 'Collection' or 'Image' in the first 200 lines.
         >>> from galaxy.datatypes.sniff import get_test_fname
@@ -197,7 +202,7 @@ class Phyloxml(GenericXml):
     edam_format = "format_3159"
     file_ext = "phyloxml"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         """Set the peek and blurb text"""
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
@@ -206,7 +211,7 @@ class Phyloxml(GenericXml):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disk"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """ "Checking for keyword - 'phyloxml' always in lowercase in the first few lines.
 
         >>> from galaxy.datatypes.sniff import get_test_fname
@@ -222,13 +227,6 @@ class Phyloxml(GenericXml):
         """
         return self._has_root_element_in_prefix(file_prefix, "phyloxml")
 
-    def get_visualizations(self, dataset):
-        """
-        Returns a list of visualizations for datatype.
-        """
-
-        return ["phyloviz"]
-
 
 class Owl(GenericXml):
     """
@@ -239,7 +237,7 @@ class Owl(GenericXml):
     edam_format = "format_3262"
     file_ext = "owl"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
             dataset.blurb = "Web Ontology Language OWL"
@@ -247,7 +245,7 @@ class Owl(GenericXml):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disc"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Checking for keyword - '<owl' in the first 200 lines.
         """
@@ -264,7 +262,7 @@ class Sbml(GenericXml):
     edam_data = "data_2024"
     edam_format = "format_2585"
 
-    def set_peek(self, dataset):
+    def set_peek(self, dataset: "DatasetInstance", **kwd) -> None:
         if not dataset.dataset.purged:
             dataset.peek = data.get_file_peek(dataset.file_name)
             dataset.blurb = "System Biology Markup Language SBML"
@@ -272,7 +270,7 @@ class Sbml(GenericXml):
             dataset.peek = "file does not exist"
             dataset.blurb = "file purged from disc"
 
-    def sniff_prefix(self, file_prefix: FilePrefix):
+    def sniff_prefix(self, file_prefix: FilePrefix) -> bool:
         """
         Checking for keyword - '<sbml' in the first 200 lines.
         """
diff --git a/lib/galaxy/dependencies/__init__.py b/lib/galaxy/dependencies/__init__.py
index 0581bbd151e..89934921209 100644
--- a/lib/galaxy/dependencies/__init__.py
+++ b/lib/galaxy/dependencies/__init__.py
@@ -224,6 +224,9 @@ class ConditionalDependencies:
     def check_python_ldap(self):
         return "ldap" in self.authenticators or "activedirectory" in self.authenticators
 
+    def check_ldap3(self):
+        return "ldap3" in self.authenticators
+
     def check_python_pam(self):
         return "PAM" in self.authenticators
 
@@ -282,9 +285,6 @@ class ConditionalDependencies:
     def check_influxdb(self):
         return "influxdb" in self.error_report_modules
 
-    def check_keras(self):
-        return asbool(self.config["enable_tool_recommendations"])
-
     def check_tensorflow(self):
         return asbool(self.config["enable_tool_recommendations"])
 
diff --git a/lib/galaxy/dependencies/conditional-requirements.txt b/lib/galaxy/dependencies/conditional-requirements.txt
index 203badfcaf5..57493b9389e 100644
--- a/lib/galaxy/dependencies/conditional-requirements.txt
+++ b/lib/galaxy/dependencies/conditional-requirements.txt
@@ -9,10 +9,11 @@ statsd
 azure-storage==0.32.0
 python-irodsclient==1.1.3
 python-ldap==3.4.0
+ldap3==2.9.1
 python-pam
 galaxycloudrunner
 pkce
-total-perspective-vortex<2
+total-perspective-vortex<3
 
 # For file sources plugins
 fs.webdavfs>=0.4.2  # type: webdav
@@ -47,9 +48,11 @@ pygithub
 influxdb
 
 # Deep learning packages for tool recommendation
-tensorflow==2.7.2
+tensorflow==2.9.3
 
-# weasyprint has problematic requirements so make it optional (i.e. cairo)
+# weasyprint has problematic requirements (cairo, Pango, see:
+# https://doc.courtbouillon.org/weasyprint/stable/first_steps.html#linux)
+# so make it optional
 # xref https://github.com/galaxyproject/galaxy/pull/9651
 # Run run.sh or common_startup script with GALAXY_DEPENDENCIES_INSTALL_WEASYPRINT=1
 # to install weasyprint as part of Galaxy's conditonal dependency instalation process.
diff --git a/lib/galaxy/dependencies/dev-requirements.txt b/lib/galaxy/dependencies/dev-requirements.txt
index 5f38dae3d95..2d83fdd2c9f 100644
--- a/lib/galaxy/dependencies/dev-requirements.txt
+++ b/lib/galaxy/dependencies/dev-requirements.txt
@@ -1,85 +1,86 @@
 aiohttp==3.8.3 ; python_version >= "3.7" and python_version < "3.11"
 aiosignal==1.3.1 ; python_version >= "3.7" and python_version < "3.11"
-alabaster==0.7.12 ; python_version >= "3.7" and python_version < "3.11"
+alabaster==0.7.13 ; python_version >= "3.7" and python_version < "3.11"
 amqp==5.1.1 ; python_version >= "3.7" and python_version < "3.11"
 anyio==3.6.2 ; python_version >= "3.7" and python_version < "3.11"
 ase==3.22.1 ; python_version >= "3.7" and python_version < "3.11"
 async-generator==1.10 ; python_version >= "3.7" and python_version < "3.11"
 async-timeout==4.0.2 ; python_version >= "3.7" and python_version < "3.11"
 asynctest==0.13.0 ; python_version >= "3.7" and python_version < "3.8"
-attrs==22.1.0 ; python_version >= "3.7" and python_version < "3.11"
+attrs==22.2.0 ; python_version >= "3.7" and python_version < "3.11"
 babel==2.11.0 ; python_version >= "3.7" and python_version < "3.11"
 billiard==3.6.4.0 ; python_version >= "3.7" and python_version < "3.11"
-black==22.10.0 ; python_version >= "3.7" and python_version < "3.11"
+black==22.12.0 ; python_version >= "3.7" and python_version < "3.11"
 cachecontrol[filecache]==0.12.11 ; python_version >= "3.7" and python_version < "3.11"
 cached-property==1.5.2 ; python_version >= "3.7" and python_version < "3.8"
 celery==5.2.7 ; python_version >= "3.7" and python_version < "3.11"
-certifi==2022.9.24 ; python_version >= "3.7" and python_version < "3.11"
+certifi==2022.12.7 ; python_version >= "3.7" and python_version < "3.11"
 cffi==1.15.1 ; python_version >= "3.7" and python_version < "3.11"
 charset-normalizer==2.1.1 ; python_version >= "3.7" and python_version < "3.11"
 click-didyoumean==0.3.0 ; python_version >= "3.7" and python_version < "3.11"
 click-plugins==1.1.1 ; python_version >= "3.7" and python_version < "3.11"
 click-repl==0.2.0 ; python_version >= "3.7" and python_version < "3.11"
 click==8.1.3 ; python_version >= "3.7" and python_version < "3.11"
+codespell==2.2.2 ; python_version >= "3.7" and python_version < "3.11"
 colorama==0.4.6 ; python_version >= "3.7" and python_version < "3.11" and sys_platform == "win32" or python_version >= "3.7" and python_version < "3.11" and platform_system == "Windows"
 commonmark==0.9.1 ; python_version >= "3.7" and python_version < "3.11"
-coverage[toml]==6.5.0 ; python_version >= "3.7" and python_version < "3.11"
-cwltest==2.2.20210901154959 ; python_version >= "3.7" and python_version < "3.11"
+coverage[toml]==7.0.5 ; python_version >= "3.7" and python_version < "3.11"
+cwltest==2.3.20230108193615 ; python_version >= "3.7" and python_version < "3.11"
 cycler==0.11.0 ; python_version >= "3.7" and python_version < "3.11"
-darker==1.5.1 ; python_version >= "3.7" and python_version < "3.11"
+darker==1.6.1 ; python_version >= "3.7" and python_version < "3.11"
 defusedxml==0.7.1 ; python_version >= "3.7" and python_version < "3.11"
 deprecated==1.2.13 ; python_version >= "3.7" and python_version < "3.11"
 docutils==0.16 ; python_version >= "3.7" and python_version < "3.11"
-exceptiongroup==1.0.4 ; python_version >= "3.7" and python_version < "3.11"
+exceptiongroup==1.1.0 ; python_version >= "3.7" and python_version < "3.11"
 fluent-logger==0.10.0 ; python_version >= "3.7" and python_version < "3.11"
 fonttools==4.38.0 ; python_version >= "3.7" and python_version < "3.11"
 frozenlist==1.3.3 ; python_version >= "3.7" and python_version < "3.11"
-future==0.18.2 ; python_version >= "3.7" and python_version < "3.11"
+future==0.18.3 ; python_version >= "3.7" and python_version < "3.11"
 h11==0.14.0 ; python_version >= "3.7" and python_version < "3.11"
-httpcore==0.16.2 ; python_version >= "3.7" and python_version < "3.11"
-httpx==0.23.1 ; python_version >= "3.7" and python_version < "3.11"
+httpcore==0.16.3 ; python_version >= "3.7" and python_version < "3.11"
+httpx==0.23.3 ; python_version >= "3.7" and python_version < "3.11"
 idna==3.4 ; python_version >= "3.7" and python_version < "3.11"
 imagesize==1.4.1 ; python_version >= "3.7" and python_version < "3.11"
 importlib-metadata==4.13.0 ; python_version >= "3.7" and python_version < "3.10"
-iniconfig==1.1.1 ; python_version >= "3.7" and python_version < "3.11"
+iniconfig==2.0.0 ; python_version >= "3.7" and python_version < "3.11"
 isodate==0.6.1 ; python_version >= "3.7" and python_version < "3.11"
-isort==5.10.1 ; python_version >= "3.7" and python_version < "3.11"
+isort==5.11.4 ; python_version >= "3.7" and python_version < "3.11"
 jinja2==3.1.2 ; python_version >= "3.7" and python_version < "3.11"
 junit-xml==1.9 ; python_version >= "3.7" and python_version < "3.11"
 kiwisolver==1.4.4 ; python_version >= "3.7" and python_version < "3.11"
 kombu==5.2.4 ; python_version >= "3.7" and python_version < "3.11"
 lockfile==0.12.2 ; python_version >= "3.7" and python_version < "3.11"
-lxml==4.9.1 ; python_version >= "3.7" and python_version < "3.11"
+lxml==4.9.2 ; python_version >= "3.7" and python_version < "3.11"
 markdown-it-reporter==0.0.2 ; python_version >= "3.7" and python_version < "3.11"
 markdown==3.4.1 ; python_version >= "3.7" and python_version < "3.11"
 markupsafe==2.1.1 ; python_version >= "3.7" and python_version < "3.11"
 matplotlib==3.5.3 ; python_version >= "3.7" and python_version < "3.11"
 mirakuru==2.4.2 ; python_version >= "3.7" and python_version < "3.11"
-mistune==0.8.4 ; python_version >= "3.7" and python_version < "3.11"
+mistune==2.0.4 ; python_version >= "3.7" and python_version < "3.11"
 msgpack==1.0.4 ; python_version >= "3.7" and python_version < "3.11"
-multidict==6.0.2 ; python_version >= "3.7" and python_version < "3.11"
+multidict==6.0.4 ; python_version >= "3.7" and python_version < "3.11"
 mypy-extensions==0.4.3 ; python_version >= "3.7" and python_version < "3.11"
 numpy==1.21.6 ; python_version >= "3.7" and python_version < "3.11"
 outcome==1.2.0 ; python_version >= "3.7" and python_version < "3.11"
 packaging==21.3 ; python_version >= "3.7" and python_version < "3.11"
-pathspec==0.10.2 ; python_version >= "3.7" and python_version < "3.11"
-pillow==9.3.0 ; python_version >= "3.7" and python_version < "3.11"
+pathspec==0.10.3 ; python_version >= "3.7" and python_version < "3.11"
+pillow==9.4.0 ; python_version >= "3.7" and python_version < "3.11"
 pkce==1.0.3 ; python_version >= "3.7" and python_version < "3.11"
-platformdirs==2.5.4 ; python_version >= "3.7" and python_version < "3.11"
+platformdirs==2.6.2 ; python_version >= "3.7" and python_version < "3.11"
 pluggy==1.0.0 ; python_version >= "3.7" and python_version < "3.11"
-port-for==0.6.2 ; python_version >= "3.7" and python_version < "3.11"
-prettytable==3.5.0 ; python_version >= "3.7" and python_version < "3.11"
-prompt-toolkit==3.0.33 ; python_version >= "3.7" and python_version < "3.11"
+port-for==0.6.3 ; python_version >= "3.7" and python_version < "3.11"
+prettytable==3.6.0 ; python_version >= "3.7" and python_version < "3.11"
+prompt-toolkit==3.0.36 ; python_version >= "3.7" and python_version < "3.11"
 psutil==5.9.4 ; python_version >= "3.7" and python_version < "3.11" and sys_platform != "cygwin"
 py==1.11.0 ; python_version >= "3.7" and python_version < "3.11"
 pycparser==2.21 ; python_version >= "3.7" and python_version < "3.11"
 pygithub==1.57 ; python_version >= "3.7" and python_version < "3.11"
-pygments==2.13.0 ; python_version >= "3.7" and python_version < "3.11"
+pygments==2.14.0 ; python_version >= "3.7" and python_version < "3.11"
 pyjwt==2.6.0 ; python_version >= "3.7" and python_version < "3.11"
 pynacl==1.5.0 ; python_version >= "3.7" and python_version < "3.11"
 pyparsing==3.0.9 ; python_version >= "3.7" and python_version < "3.11"
 pysocks==1.7.1 ; python_version >= "3.7" and python_version < "3.11"
-pytest-asyncio==0.20.2 ; python_version >= "3.7" and python_version < "3.11"
+pytest-asyncio==0.20.3 ; python_version >= "3.7" and python_version < "3.11"
 pytest-celery==0.0.0 ; python_version >= "3.7" and python_version < "3.11"
 pytest-cov==4.0.0 ; python_version >= "3.7" and python_version < "3.11"
 pytest-html==3.2.0 ; python_version >= "3.7" and python_version < "3.11"
@@ -91,19 +92,19 @@ pytest-shard==0.1.2 ; python_version >= "3.7" and python_version < "3.11"
 pytest==7.2.0 ; python_version >= "3.7" and python_version < "3.11"
 python-dateutil==2.8.2 ; python_version >= "3.7" and python_version < "3.11"
 python-irodsclient==1.1.5 ; python_version >= "3.7" and python_version < "3.11"
-pytz==2022.6 ; python_version >= "3.7" and python_version < "3.11"
+pytz==2022.7 ; python_version >= "3.7" and python_version < "3.11"
 rdflib==6.2.0 ; python_version >= "3.7" and python_version < "3.11"
 recommonmark==0.7.1 ; python_version >= "3.7" and python_version < "3.11"
-requests==2.28.1 ; python_version >= "3.7" and python_version < "3.11"
+requests==2.28.2 ; python_version >= "3.7" and python_version < "3.11"
 responses==0.22.0 ; python_version >= "3.7" and python_version < "3.11"
 rfc3986[idna2008]==1.5.0 ; python_version >= "3.7" and python_version < "3.11"
 ruamel-yaml-clib==0.2.7 ; platform_python_implementation == "CPython" and python_version < "3.11" and python_version >= "3.7"
 ruamel-yaml==0.17.21 ; python_version >= "3.7" and python_version < "3.11"
-schema-salad==8.3.20221115203138 ; python_version >= "3.7" and python_version < "3.11"
+schema-salad==8.3.20230109181936 ; python_version >= "3.7" and python_version < "3.11"
 scipy==1.7.3 ; python_version >= "3.7" and python_version < "3.11"
 selenium==4.7.2 ; python_version >= "3.7" and python_version < "3.11"
-setuptools-scm==5.0.2 ; python_version >= "3.7" and python_version < "3.11"
-setuptools==65.6.3 ; python_version >= "3.7" and python_version < "3.11"
+seletools==1.3.0 ; python_version >= "3.7" and python_version < "3.11"
+setuptools==65.7.0 ; python_version >= "3.7" and python_version < "3.11"
 six==1.16.0 ; python_version >= "3.7" and python_version < "3.11"
 sniffio==1.3.0 ; python_version >= "3.7" and python_version < "3.11"
 snowballstemmer==2.2.0 ; python_version >= "3.7" and python_version < "3.11"
@@ -118,7 +119,7 @@ sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.7" and python_version < "3.11
 sphinxcontrib-qthelp==1.0.3 ; python_version >= "3.7" and python_version < "3.11"
 sphinxcontrib-serializinghtml==1.1.5 ; python_version >= "3.7" and python_version < "3.11"
 statsd==4.0.1 ; python_version >= "3.7" and python_version < "3.11"
-testfixtures==7.0.3 ; python_version >= "3.7" and python_version < "3.11"
+testfixtures==7.0.4 ; python_version >= "3.7" and python_version < "3.11"
 tinydb==4.7.0 ; python_version >= "3.7" and python_version < "3.11"
 toml==0.10.2 ; python_version >= "3.7" and python_version < "3.11"
 tomli==2.0.1 ; python_version >= "3.7" and python_version < "3.11"
@@ -128,13 +129,13 @@ tuspy==1.0.0 ; python_version >= "3.7" and python_version < "3.11"
 twill==3.1 ; python_version >= "3.7" and python_version < "3.11"
 typed-ast==1.5.4 ; python_version < "3.8" and implementation_name == "cpython" and python_version >= "3.7"
 types-toml==0.10.8.1 ; python_version >= "3.7" and python_version < "3.11"
-typing-extensions==4.4.0 ; python_version >= "3.7" and python_version < "3.10"
-urllib3==1.26.13 ; python_version >= "3.7" and python_version < "3.11"
-urllib3[socks]==1.26.13 ; python_version >= "3.7" and python_version < "3.11"
+typing-extensions==4.4.0 ; python_version >= "3.7" and python_version < "3.11"
+urllib3==1.26.14 ; python_version >= "3.7" and python_version < "3.11"
+urllib3[socks]==1.26.14 ; python_version >= "3.7" and python_version < "3.11"
 vine==5.0.0 ; python_version >= "3.7" and python_version < "3.11"
-watchdog==2.1.9 ; python_version >= "3.7" and python_version < "3.11"
+watchdog==2.2.1 ; python_version >= "3.7" and python_version < "3.11"
 wcwidth==0.2.5 ; python_version >= "3.7" and python_version < "3.11"
 wrapt==1.14.1 ; python_version >= "3.7" and python_version < "3.11"
 wsproto==1.2.0 ; python_version >= "3.7" and python_version < "3.11"
-yarl==1.8.1 ; python_version >= "3.7" and python_version < "3.11"
+yarl==1.8.2 ; python_version >= "3.7" and python_version < "3.11"
 zipp==3.11.0 ; python_version >= "3.7" and python_version < "3.10"
diff --git a/lib/galaxy/dependencies/lint-requirements.txt b/lib/galaxy/dependencies/lint-requirements.txt
index 675b2c5d0d8..4fd40cd5703 100644
--- a/lib/galaxy/dependencies/lint-requirements.txt
+++ b/lib/galaxy/dependencies/lint-requirements.txt
@@ -1,2 +1,3 @@
 flake8
 flake8-bugbear
+ruff
diff --git a/lib/galaxy/dependencies/pinned-lint-requirements.txt b/lib/galaxy/dependencies/pinned-lint-requirements.txt
index 0d242b5c6c6..4cf3961e3dd 100644
--- a/lib/galaxy/dependencies/pinned-lint-requirements.txt
+++ b/lib/galaxy/dependencies/pinned-lint-requirements.txt
@@ -1,9 +1,10 @@
-attrs==22.1.0
+attrs==22.2.0
 flake8==5.0.4
-flake8-bugbear==22.10.27
+flake8-bugbear==22.12.6
 importlib-metadata==4.2.0
 mccabe==0.7.0
 pycodestyle==2.9.1
 pyflakes==2.5.0
+ruff==0.0.223
 typing_extensions==4.4.0
 zipp==3.11.0
diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt
index f6e37396a5f..d369ca9eb30 100644
--- a/lib/galaxy/dependencies/pinned-requirements.txt
+++ b/lib/galaxy/dependencies/pinned-requirements.txt
@@ -5,7 +5,7 @@ adal==1.2.7 ; python_version >= "3.7" and python_version < "3.11"
 aiofiles==22.1.0 ; python_version >= "3.7" and python_version < "3.11"
 aiohttp==3.8.3 ; python_version >= "3.7" and python_version < "3.11"
 aiosignal==1.3.1 ; python_version >= "3.7" and python_version < "3.11"
-alembic==1.8.1 ; python_version >= "3.7" and python_version < "3.11"
+alembic==1.9.1 ; python_version >= "3.7" and python_version < "3.11"
 amqp==5.1.1 ; python_version >= "3.7" and python_version < "3.11"
 anyio==3.6.2 ; python_version >= "3.7" and python_version < "3.11"
 apispec==6.0.2 ; python_version >= "3.7" and python_version < "3.11"
@@ -15,7 +15,7 @@ argcomplete==2.0.0 ; python_version >= "3.7" and python_version < "3.11"
 async-timeout==4.0.2 ; python_version >= "3.7" and python_version < "3.11"
 asynctest==0.13.0 ; python_version >= "3.7" and python_version < "3.8"
 attmap==0.13.2 ; python_version >= "3.7" and python_version < "3.11"
-attrs==22.1.0 ; python_version >= "3.7" and python_version < "3.11"
+attrs==22.2.0 ; python_version >= "3.7" and python_version < "3.11"
 babel==2.11.0 ; python_version >= "3.7" and python_version < "3.11"
 bagit-profile==1.3.1 ; python_version >= "3.7" and python_version < "3.11"
 bagit==1.8.1 ; python_version >= "3.7" and python_version < "3.11"
@@ -32,7 +32,7 @@ cachecontrol==0.12.11 ; python_version >= "3.7" and python_version < "3.11"
 cachecontrol[filecache]==0.12.11 ; python_version >= "3.7" and python_version < "3.11"
 cached-property==1.5.2 ; python_version >= "3.7" and python_version < "3.8"
 celery==5.2.7 ; python_version >= "3.7" and python_version < "3.11"
-certifi==2022.9.24 ; python_version >= "3.7" and python_version < "3.11"
+certifi==2022.12.7 ; python_version >= "3.7" and python_version < "3.11"
 cffi==1.15.1 ; python_version >= "3.7" and python_version < "3.11"
 charset-normalizer==2.1.1 ; python_version >= "3.7" and python_version < "3.11"
 cheetah3==3.2.6.post1 ; python_version >= "3.7" and python_version < "3.11"
@@ -46,7 +46,7 @@ cloudbridge==3.1.0 ; python_version >= "3.7" and python_version < "3.11"
 colorama==0.4.6 ; python_version >= "3.7" and python_version < "3.11" and platform_system == "Windows"
 coloredlogs==15.0.1 ; python_version >= "3.7" and python_version < "3.11"
 commonmark==0.9.1 ; python_version >= "3.7" and python_version < "3.11"
-cryptography==38.0.4 ; python_version >= "3.7" and python_version < "3.11"
+cryptography==39.0.0 ; python_version >= "3.7" and python_version < "3.11"
 cwl-upgrader==1.2.4 ; python_version >= "3.7" and python_version < "3.11"
 cwl-utils==0.21 ; python_version >= "3.7" and python_version < "3.11"
 cwltool==3.1.20221109155812 ; python_version >= "3.7" and python_version < "3.11"
@@ -61,23 +61,23 @@ ecdsa==0.18.0 ; python_version >= "3.7" and python_version < "3.11"
 edam-ontology==1.25.2 ; python_version >= "3.7" and python_version < "3.11"
 email-validator==1.3.0 ; python_version >= "3.7" and python_version < "3.11"
 fastapi-utils==0.2.1 ; python_version >= "3.7" and python_version < "3.11"
-fastapi==0.88.0 ; python_version >= "3.7" and python_version < "3.11"
+fastapi==0.89.1 ; python_version >= "3.7" and python_version < "3.11"
 frozenlist==1.3.3 ; python_version >= "3.7" and python_version < "3.11"
 fs==2.4.16 ; python_version >= "3.7" and python_version < "3.11"
 funcsigs==1.0.2 ; python_version >= "3.7" and python_version < "3.11"
-future==0.18.2 ; python_version >= "3.7" and python_version < "3.11"
+future==0.18.3 ; python_version >= "3.7" and python_version < "3.11"
 galaxy-sequence-utils==1.1.5 ; python_version >= "3.7" and python_version < "3.11"
 galaxy2cwl==0.1.4 ; python_version >= "3.7" and python_version < "3.11"
 gravity @ git+https://github.com/galaxyproject/gravity.git@release_1.x ; python_version >= "3.7" and python_version < "3.11"
 greenlet==2.0.1 ; python_version >= "3.7" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and python_version < "3.11"
 gunicorn==20.1.0 ; python_version >= "3.7" and python_version < "3.11"
-gxformat2==0.16.0 ; python_version >= "3.7" and python_version < "3.11"
+gxformat2==0.17.0 ; python_version >= "3.7" and python_version < "3.11"
 h11==0.14.0 ; python_version >= "3.7" and python_version < "3.11"
 h5py==3.7.0 ; python_version >= "3.7" and python_version < "3.11"
 humanfriendly==10.0 ; python_version >= "3.7" and python_version < "3.11"
 idna==3.4 ; python_version >= "3.7" and python_version < "3.11"
 importlib-metadata==4.13.0 ; python_version >= "3.7" and python_version < "3.10"
-importlib-resources==5.10.0 ; python_version >= "3.7" and python_version < "3.11"
+importlib-resources==5.10.2 ; python_version >= "3.7" and python_version < "3.11"
 isa-rwval==0.10.10 ; python_version >= "3.7" and python_version < "3.11"
 isodate==0.6.1 ; python_version >= "3.7" and python_version < "3.11"
 jinja2==3.1.2 ; python_version >= "3.7" and python_version < "3.11"
@@ -86,15 +86,15 @@ jsonschema==4.17.3 ; python_version >= "3.7" and python_version < "3.11"
 kombu==5.2.4 ; python_version >= "3.7" and python_version < "3.11"
 lagom==2.2.0 ; python_version >= "3.7" and python_version < "3.11"
 lockfile==0.12.2 ; python_version >= "3.7" and python_version < "3.11"
-lxml==4.9.1 ; python_version >= "3.7" and python_version < "3.11"
+lxml==4.9.2 ; python_version >= "3.7" and python_version < "3.11"
 mako==1.2.4 ; python_version >= "3.7" and python_version < "3.11"
 markdown==3.4.1 ; python_version >= "3.7" and python_version < "3.11"
 markupsafe==2.1.1 ; python_version >= "3.7" and python_version < "3.11"
-mercurial==6.3.1 ; python_version >= "3.7" and python_version < "3.11"
-mistune==0.8.4 ; python_version >= "3.7" and python_version < "3.11"
+mercurial==6.3.2 ; python_version >= "3.7" and python_version < "3.11"
+mistune==2.0.4 ; python_version >= "3.7" and python_version < "3.11"
 mrcfile==1.4.3 ; python_version >= "3.7" and python_version < "3.11"
 msgpack==1.0.4 ; python_version >= "3.7" and python_version < "3.11"
-multidict==6.0.2 ; python_version >= "3.7" and python_version < "3.11"
+multidict==6.0.4 ; python_version >= "3.7" and python_version < "3.11"
 mypy-extensions==0.4.3 ; python_version >= "3.7" and python_version < "3.11"
 networkx==2.5 ; python_version >= "3.7" and python_version < "3.11"
 nodeenv==1.7.0 ; python_version >= "3.7" and python_version < "3.11"
@@ -106,24 +106,23 @@ paramiko==2.12.0 ; python_version >= "3.7" and python_version < "3.11"
 parsley==1.3 ; python_version >= "3.7" and python_version < "3.11"
 paste==3.5.2 ; python_version >= "3.7" and python_version < "3.11"
 pastedeploy==3.0.1 ; python_version >= "3.7" and python_version < "3.11"
-pbr==5.11.0 ; python_version >= "3.7" and python_version < "3.11"
+pbr==5.11.1 ; python_version >= "3.7" and python_version < "3.11"
 pebble==5.0.3 ; python_version >= "3.7" and python_version < "3.11"
 pkgutil-resolve-name==1.3.10 ; python_version >= "3.7" and python_version < "3.9"
-prompt-toolkit==3.0.33 ; python_version >= "3.7" and python_version < "3.11"
+prompt-toolkit==3.0.36 ; python_version >= "3.7" and python_version < "3.11"
 prov==1.5.1 ; python_version >= "3.7" and python_version < "3.11"
 psutil==5.9.4 ; python_version >= "3.7" and python_version < "3.11"
 pulsar-galaxy-lib==0.15.0.dev0 ; python_version >= "3.7" and python_version < "3.11"
-py==1.11.0 ; python_version >= "3.7" and python_version < "3.11" and implementation_name == "pypy"
 pyasn1==0.4.8 ; python_version >= "3.7" and python_version < "3.11"
 pycparser==2.21 ; python_version >= "3.7" and python_version < "3.11"
 pycryptodome==3.16.0 ; python_version >= "3.7" and python_version < "3.11"
 pydantic-tes==0.1.5 ; python_version >= "3.7" and python_version < "3.11"
-pydantic==1.10.2 ; python_version >= "3.7" and python_version < "3.11"
-pydantic[email]==1.10.2 ; python_version >= "3.7" and python_version < "3.11"
+pydantic==1.10.4 ; python_version >= "3.7" and python_version < "3.11"
+pydantic[email]==1.10.4 ; python_version >= "3.7" and python_version < "3.11"
 pydot==1.4.2 ; python_version >= "3.7" and python_version < "3.11"
 pyeventsystem==0.1.0 ; python_version >= "3.7" and python_version < "3.11"
 pyfaidx==0.7.1 ; python_version >= "3.7" and python_version < "3.11"
-pygments==2.13.0 ; python_version >= "3.7" and python_version < "3.11"
+pygments==2.14.0 ; python_version >= "3.7" and python_version < "3.11"
 pyjwt==2.6.0 ; python_version >= "3.7" and python_version < "3.11"
 pykwalify==1.8.0 ; python_version >= "3.7" and python_version < "3.11"
 pylibmagic==0.2.2 ; python_version >= "3.7" and python_version < "3.11"
@@ -131,43 +130,44 @@ pynacl==1.5.0 ; python_version >= "3.7" and python_version < "3.11"
 pyparsing==3.0.9 ; python_version >= "3.7" and python_version < "3.11"
 pyreadline3==3.4.1 ; sys_platform == "win32" and python_version >= "3.8" and python_version < "3.11"
 pyreadline==2.1 ; sys_platform == "win32" and python_version < "3.8" and python_version >= "3.7"
-pyrsistent==0.19.2 ; python_version >= "3.7" and python_version < "3.11"
-pysam==0.19.1 ; python_version >= "3.7" and python_version < "3.11"
+pyrsistent==0.19.3 ; python_version >= "3.7" and python_version < "3.11"
+pysam==0.20.0 ; python_version >= "3.7" and python_version < "3.11"
 python-dateutil==2.8.2 ; python_version >= "3.7" and python_version < "3.11"
 python-jose==3.3.0 ; python_version >= "3.7" and python_version < "3.11"
 python-magic==0.4.27 ; python_version >= "3.7" and python_version < "3.11"
 python-multipart==0.0.5 ; python_version >= "3.7" and python_version < "3.11"
 python3-openid==3.2.0 ; python_version >= "3.7" and python_version < "3.11"
-pytz==2022.6 ; python_version >= "3.7" and python_version < "3.11"
+pytz==2022.7 ; python_version >= "3.7" and python_version < "3.11"
 pyyaml==6.0 ; python_version >= "3.7" and python_version < "3.11"
-pyzmq==24.0.1 ; python_version >= "3.7" and python_version < "3.11"
+pyzmq==25.0.0 ; python_version >= "3.7" and python_version < "3.11"
 rdflib==6.2.0 ; python_version >= "3.7" and python_version < "3.11"
 refgenconf==0.12.2 ; python_version >= "3.7" and python_version < "3.11"
 repoze-lru==0.7 ; python_version >= "3.7" and python_version < "3.11"
 requests-oauthlib==1.3.1 ; python_version >= "3.7" and python_version < "3.11"
 requests-toolbelt==0.10.1 ; python_version >= "3.7" and python_version < "3.11"
-requests==2.28.1 ; python_version >= "3.7" and python_version < "3.11"
-rich==12.6.0 ; python_version >= "3.7" and python_version < "3.11"
+requests-unixsocket==0.3.0 ; python_version >= "3.7" and python_version < "3.11"
+requests==2.28.2 ; python_version >= "3.7" and python_version < "3.11"
+rich==13.0.1 ; python_version >= "3.7" and python_version < "3.11"
 rocrate==0.7.0 ; python_version >= "3.7" and python_version < "3.11"
 routes==2.5.1 ; python_version >= "3.7" and python_version < "3.11"
 rsa==4.9 ; python_version >= "3.7" and python_version < "3.11"
 ruamel-yaml-clib==0.2.7 ; platform_python_implementation == "CPython" and python_version < "3.11" and python_version >= "3.7"
 ruamel-yaml==0.17.21 ; python_version < "3.11" and python_version >= "3.7"
-schema-salad==8.3.20221115203138 ; python_version >= "3.7" and python_version < "3.11"
+schema-salad==8.3.20230109181936 ; python_version >= "3.7" and python_version < "3.11"
 setuptools-scm==5.0.2 ; python_version >= "3.7" and python_version < "3.11"
-setuptools==65.6.3 ; python_version >= "3.7" and python_version < "3.11"
+setuptools==65.7.0 ; python_version >= "3.7" and python_version < "3.11"
 shellescape==3.8.1 ; python_version >= "3.7" and python_version < "3.11"
 six==1.16.0 ; python_version >= "3.7" and python_version < "3.11"
 sniffio==1.3.0 ; python_version >= "3.7" and python_version < "3.11"
 social-auth-core[openidconnect]==4.0.3 ; python_version >= "3.7" and python_version < "3.11"
 sortedcontainers==2.4.0 ; python_version >= "3.7" and python_version < "3.11"
 sqlalchemy-migrate==0.13.0 ; python_version >= "3.7" and python_version < "3.11"
-sqlalchemy==1.4.44 ; python_version >= "3.7" and python_version < "3.11"
-sqlitedict==2.0.0 ; python_version >= "3.7" and python_version < "3.11"
+sqlalchemy==1.4.46 ; python_version >= "3.7" and python_version < "3.11"
+sqlitedict==2.1.0 ; python_version >= "3.7" and python_version < "3.11"
 sqlparse==0.4.3 ; python_version >= "3.7" and python_version < "3.11"
 starlette-context==0.3.5 ; python_version >= "3.7" and python_version < "3.11"
 starlette==0.22.0 ; python_version >= "3.7" and python_version < "3.11"
-supervisor==4.2.4 ; python_version >= "3.7" and python_version < "3.11"
+supervisor==4.2.5 ; python_version >= "3.7" and python_version < "3.11"
 svgwrite==1.4.3 ; python_version >= "3.7" and python_version < "3.11"
 tempita==0.5.2 ; python_version >= "3.7" and python_version < "3.11"
 tenacity==8.1.0 ; python_version >= "3.7" and python_version < "3.11"
@@ -180,7 +180,7 @@ tuswsgi==0.5.4 ; python_version >= "3.7" and python_version < "3.11"
 typing-extensions==4.4.0 ; python_version >= "3.7" and python_version < "3.11"
 tzlocal==2.1 ; python_version >= "3.7" and python_version < "3.11"
 ubiquerg==0.6.2 ; python_version >= "3.7" and python_version < "3.11"
-urllib3==1.26.13 ; python_version >= "3.7" and python_version < "3.11"
+urllib3==1.26.14 ; python_version >= "3.7" and python_version < "3.11"
 uvicorn==0.20.0 ; python_version >= "3.7" and python_version < "3.11"
 uvloop==0.17.0 ; python_version >= "3.7" and python_version < "3.11"
 vine==5.0.0 ; python_version >= "3.7" and python_version < "3.11"
@@ -189,6 +189,6 @@ webencodings==0.5.1 ; python_version >= "3.7" and python_version < "3.11"
 webob==1.8.7 ; python_version >= "3.7" and python_version < "3.11"
 whoosh==2.7.4 ; python_version >= "3.7" and python_version < "3.11"
 yacman==0.8.4 ; python_version >= "3.7" and python_version < "3.11"
-yarl==1.8.1 ; python_version >= "3.7" and python_version < "3.11"
+yarl==1.8.2 ; python_version >= "3.7" and python_version < "3.11"
 zipp==3.11.0 ; python_version >= "3.7" and python_version < "3.10"
 zipstream-new==1.1.8 ; python_version >= "3.7" and python_version < "3.11"
diff --git a/lib/galaxy/dependencies/pinned-typecheck-requirements.txt b/lib/galaxy/dependencies/pinned-typecheck-requirements.txt
index 0f43f72f17a..f1e1c5305b3 100644
--- a/lib/galaxy/dependencies/pinned-typecheck-requirements.txt
+++ b/lib/galaxy/dependencies/pinned-typecheck-requirements.txt
@@ -1,19 +1,21 @@
+cffi==1.15.1
+cryptography==39.0.0
 mypy==0.991
 mypy-extensions==0.4.3
+pycparser==2.21
 tomli==2.0.1
 typed-ast==1.5.4
 types-bleach==5.0.3.1
-types-boto==2.49.18.3
+types-boto==2.49.18.4
 types-contextvars==2.4.7
-types-cryptography==3.3.23.2
 types-dataclasses==0.6.6
 types-docutils==0.19.1.1
 types-Markdown==3.4.2.1
-types-paramiko==2.12.0.1
+types-paramiko==2.12.0.2
 types-pkg-resources==0.1.3
-types-python-dateutil==2.8.19.4
+types-python-dateutil==2.8.19.5
 types-PyYAML==6.0.12.2
-types-requests==2.28.11.5
+types-requests==2.28.11.7
 types-six==1.16.21.4
 types-urllib3==1.26.25.4
 typing_extensions==4.4.0
diff --git a/lib/galaxy/di.py b/lib/galaxy/di.py
index e1f31bd57cd..5f27b4e8717 100644
--- a/lib/galaxy/di.py
+++ b/lib/galaxy/di.py
@@ -27,6 +27,12 @@ class Container(LagomContainer):
         self[dep_type] = instance
         return self[dep_type]
 
+    def _register_abstract_singleton(
+        self, abstract_type: Type[T], concrete_type: Type[T], instance: Optional[T] = None
+    ) -> T:
+        self[abstract_type] = instance if instance is not None else concrete_type
+        return self[abstract_type]
+
     def resolve_or_none(self, dep_type: Type[T]) -> Optional[T]:
         """Resolve the dependent type or just return None.
 
diff --git a/lib/galaxy/exceptions/__init__.py b/lib/galaxy/exceptions/__init__.py
index 291b7514de3..f14a816d634 100644
--- a/lib/galaxy/exceptions/__init__.py
+++ b/lib/galaxy/exceptions/__init__.py
@@ -16,7 +16,7 @@ have nothing to do with the web - keep this in mind when defining exception name
 and messages.
 """
 
-from ..exceptions.error_codes import (
+from .error_codes import (
     error_codes_by_name,
     ErrorCode,
 )
@@ -59,6 +59,16 @@ class ObjectInvalid(Exception):
 # Please keep the exceptions ordered by status code
 
 
+class AcceptedRetryLater(MessageException):
+    status_code = 202
+    err_code = error_codes_by_name["ACCEPTED_RETRY_LATER"]
+    retry_after: int
+
+    def __init__(self, msg, retry_after=60):
+        super().__init__(msg)
+        self.retry_after = retry_after
+
+
 class NoContentException(MessageException):
     status_code = 204
     err_code = error_codes_by_name["NO_CONTENT_GENERIC"]
diff --git a/lib/galaxy/exceptions/error_codes.json b/lib/galaxy/exceptions/error_codes.json
index b2a832e2981..1e9f33aaae7 100644
--- a/lib/galaxy/exceptions/error_codes.json
+++ b/lib/galaxy/exceptions/error_codes.json
@@ -4,6 +4,11 @@
       "code": 0,
       "message": "Unknown error occurred while processing request."
    },
+   {
+      "name": "ACCEPTED_RETRY_LATER",
+      "code": 202001,
+      "message": "Galaxy has accepted this request and is processing. A retry-after header indicates to the client when to retry."
+   },
    {
       "name": "NO_CONTENT_GENERIC",
       "code": 204001,
diff --git a/lib/galaxy/files/sources/_pyfilesystem2.py b/lib/galaxy/files/sources/_pyfilesystem2.py
index 08abb9e4574..45162f86c5f 100644
--- a/lib/galaxy/files/sources/_pyfilesystem2.py
+++ b/lib/galaxy/files/sources/_pyfilesystem2.py
@@ -14,7 +14,7 @@ from typing import (
 import fs
 from fs.base import FS
 
-from ..sources import BaseFilesSource
+from . import BaseFilesSource
 
 log = logging.getLogger(__name__)
 
diff --git a/lib/galaxy/files/sources/posix.py b/lib/galaxy/files/sources/posix.py
index 937c6be397a..b464b8f6351 100644
--- a/lib/galaxy/files/sources/posix.py
+++ b/lib/galaxy/files/sources/posix.py
@@ -13,7 +13,7 @@ from galaxy.util.path import (
     safe_path,
     safe_walk,
 )
-from ..sources import BaseFilesSource
+from . import BaseFilesSource
 
 DEFAULT_ENFORCE_SYMLINK_SECURITY = True
 DEFAULT_DELETE_ON_REALIZE = False
diff --git a/lib/galaxy/files/sources/s3fs.py b/lib/galaxy/files/sources/s3fs.py
index 2c85609dd33..8353b4d8d51 100644
--- a/lib/galaxy/files/sources/s3fs.py
+++ b/lib/galaxy/files/sources/s3fs.py
@@ -12,7 +12,7 @@ try:
 except ImportError:
     s3fs = None
 
-from ..sources import BaseFilesSource
+from . import BaseFilesSource
 
 DEFAULT_ENFORCE_SYMLINK_SECURITY = True
 DEFAULT_DELETE_ON_REALIZE = False
diff --git a/lib/galaxy/files/uris.py b/lib/galaxy/files/uris.py
index 609ffbe59bf..d7172d15dcd 100644
--- a/lib/galaxy/files/uris.py
+++ b/lib/galaxy/files/uris.py
@@ -23,6 +23,7 @@ from galaxy.util import (
     stream_to_open_named_file,
     unicodify,
 )
+from galaxy.util.drs import fetch_drs_to_file
 
 if TYPE_CHECKING:
     from galaxy.files import ConfiguredFileSources
@@ -55,6 +56,10 @@ def stream_url_to_file(
         with tempfile.NamedTemporaryFile(prefix=prefix, delete=False, dir=dir) as temp:
             temp_name = temp.name
         file_source_path.file_source.realize_to(file_source_path.path, temp_name, user_context=user_context)
+    elif path.startswith("drs://"):
+        with tempfile.NamedTemporaryFile(prefix=prefix, delete=False) as temp:
+            temp_name = temp.name
+            fetch_drs_to_file(path, temp_name)
     elif path.startswith("base64://"):
         with tempfile.NamedTemporaryFile(prefix=prefix, delete=False, dir=dir) as temp:
             temp_name = temp.name
diff --git a/lib/galaxy/job_execution/container_monitor.py b/lib/galaxy/job_execution/container_monitor.py
index d4c56491187..ebc9be73677 100644
--- a/lib/galaxy/job_execution/container_monitor.py
+++ b/lib/galaxy/job_execution/container_monitor.py
@@ -53,7 +53,7 @@ def main():
 
     _get_ip: GetIpCallable
     if get_ip_method is not None:
-        method, arg = [e.strip() for e in get_ip_method.split(":", 1)]
+        method, arg = (e.strip() for e in get_ip_method.split(":", 1))
         if method == "command":
             _get_ip = partial(get_ip_command, arg)
         else:
diff --git a/lib/galaxy/job_execution/output_collect.py b/lib/galaxy/job_execution/output_collect.py
index 066681c2eb0..cb407ddcd6b 100644
--- a/lib/galaxy/job_execution/output_collect.py
+++ b/lib/galaxy/job_execution/output_collect.py
@@ -614,10 +614,9 @@ def walk_over_extra_files(target_dir, extra_file_collector, job_working_director
                     if match:
                         yield match
 
-    for match in extra_file_collector.sort(
+    yield from extra_file_collector.sort(
         _walk(target_dir, extra_file_collector, job_working_directory, matchable, parent_paths)
-    ):
-        yield match
+    )
 
 
 def dataset_collector(dataset_collection_description):
diff --git a/lib/galaxy/job_metrics/__init__.py b/lib/galaxy/job_metrics/__init__.py
index 0a9a39f0b2b..8fdb85f75a2 100644
--- a/lib/galaxy/job_metrics/__init__.py
+++ b/lib/galaxy/job_metrics/__init__.py
@@ -27,11 +27,11 @@ from typing import (
 
 from galaxy import util
 from galaxy.util import plugin_config
+from . import formatting
 from .safety import (
     DEFAULT_SAFETY,
     Safety,
 )
-from ..job_metrics import formatting
 
 log = logging.getLogger(__name__)
 
@@ -211,6 +211,8 @@ class JobInstrumenter(JobInstrumenterI):
                 properties = plugin.job_properties(job_id, job_directory)
                 if properties:
                     per_plugin_properties[plugin.plugin_type] = properties
+            except FileNotFoundError as e:
+                log.warning("Failed to collect job properties for plugin %s: %s", plugin, e)
             except Exception:
                 log.exception("Failed to collect job properties for plugin %s", plugin)
         return per_plugin_properties
diff --git a/lib/galaxy/jobs/runners/pulsar.py b/lib/galaxy/jobs/runners/pulsar.py
index 1ddb01d3690..39eb547a0fb 100644
--- a/lib/galaxy/jobs/runners/pulsar.py
+++ b/lib/galaxy/jobs/runners/pulsar.py
@@ -938,7 +938,7 @@ class PulsarJobRunner(AsynchronousJobRunner):
             job_state = self._job_state(job, job_wrapper)
             self._update_job_state_for_status(job_state, full_status["status"], full_status=full_status)
         except Exception:
-            log.exception("Failed to update Pulsar job status for job_id (%s/%s)" % (galaxy_job_id, remote_job_id))
+            log.exception(f"Failed to update Pulsar job status for job_id ({galaxy_job_id}/{remote_job_id})")
             raise
             # Nothing else to do? - Attempt to fail the job?
 
diff --git a/lib/galaxy/jobs/runners/util/cli/job/lsf.py b/lib/galaxy/jobs/runners/util/cli/job/lsf.py
index 68c96345096..cdaedf447a4 100644
--- a/lib/galaxy/jobs/runners/util/cli/job/lsf.py
+++ b/lib/galaxy/jobs/runners/util/cli/job/lsf.py
@@ -3,7 +3,7 @@
 from logging import getLogger
 from os import path
 
-from ..job import (
+from . import (
     BaseJobExec,
     job_states,
 )
@@ -95,6 +95,8 @@ class LSF(BaseJobExec):
         for line in reason.splitlines():
             if "TERM_MEMLIMIT" in line:
                 return runner_states.MEMORY_LIMIT_REACHED
+            if "TERM_RUNLIMIT" in line:
+                return runner_states.WALLTIME_REACHED
         return None
 
     def _get_job_state(self, state):
diff --git a/lib/galaxy/jobs/runners/util/cli/job/slurm.py b/lib/galaxy/jobs/runners/util/cli/job/slurm.py
index 5b694b13253..5c1626d7315 100644
--- a/lib/galaxy/jobs/runners/util/cli/job/slurm.py
+++ b/lib/galaxy/jobs/runners/util/cli/job/slurm.py
@@ -2,7 +2,7 @@
 # non-submit host and using a Slurm cluster.
 from logging import getLogger
 
-from ..job import (
+from . import (
     BaseJobExec,
     job_states,
 )
diff --git a/lib/galaxy/jobs/runners/util/cli/job/torque.py b/lib/galaxy/jobs/runners/util/cli/job/torque.py
index cb801ed1c0a..feb36dad949 100644
--- a/lib/galaxy/jobs/runners/util/cli/job/torque.py
+++ b/lib/galaxy/jobs/runners/util/cli/job/torque.py
@@ -1,7 +1,7 @@
 from logging import getLogger
 
 from galaxy.util import parse_xml_string
-from ..job import (
+from . import (
     BaseJobExec,
     job_states,
 )
diff --git a/lib/galaxy/jobs/splitters/multi.py b/lib/galaxy/jobs/splitters/multi.py
index 5e6b2dd8f40..afc5d289b17 100644
--- a/lib/galaxy/jobs/splitters/multi.py
+++ b/lib/galaxy/jobs/splitters/multi.py
@@ -1,7 +1,6 @@
 import logging
 import os
 import shutil
-from inspect import getfullargspec
 
 from galaxy import (
     model,
@@ -146,8 +145,7 @@ def do_merge(job_wrapper, task_wrappers):
             output_file_name = str(output_paths[index])  # Use false_path if set, else real path.
             base_output_name = os.path.basename(output_file_name)
             if output in merge_outputs:
-                output_dataset = outputs[output][0]
-                output_type = output_dataset.datatype
+                output_type = outputs[output][0].datatype
                 output_files = [os.path.join(dir, base_output_name) for dir in task_dirs]
                 # Just include those files f in the output list for which the
                 # file f exists; some files may not exist if a task fails.
@@ -159,13 +157,7 @@ def do_merge(job_wrapper, task_wrappers):
                             "merging only %i out of expected %i files for %s"
                             % (len(output_files), len(task_dirs), output_file_name)
                         )
-                    # First two args to merge always output_files and path of dataset. More
-                    # complicated merge methods may require more parameters. Set those up here.
-                    extra_merge_arg_names = getfullargspec(output_type.merge).args[2:]
-                    extra_merge_args = {}
-                    if "output_dataset" in extra_merge_arg_names:
-                        extra_merge_args["output_dataset"] = output_dataset
-                    output_type.merge(output_files, output_file_name, **extra_merge_args)
+                    output_type.merge(output_files, output_file_name)
                     log.debug(f"merge finished: {output_file_name}")
                 else:
                     msg = "nothing to merge for %s (expected %i files)" % (output_file_name, len(task_dirs))
diff --git a/lib/galaxy/managers/base.py b/lib/galaxy/managers/base.py
index 6dcb861cbbb..db7bdf94643 100644
--- a/lib/galaxy/managers/base.py
+++ b/lib/galaxy/managers/base.py
@@ -141,21 +141,21 @@ def get_class(class_name):
     return item_class
 
 
-def decode_id(app: BasicSharedApp, id: Any):
+def decode_id(app: BasicSharedApp, id: Any, kind: Optional[str] = None):
     # note: use str - occasionally a fully numeric id will be placed in post body and parsed as int via JSON
     #   resulting in error for valid id
     if isinstance(id, DecodedDatabaseIdField):
         return int(id)
     else:
-        return decode_with_security(app.security, id)
+        return decode_with_security(app.security, id, kind=kind)
 
 
-def decode_with_security(security: IdEncodingHelper, id: Any):
-    return security.decode_id(str(id))
+def decode_with_security(security: IdEncodingHelper, id: Any, kind: Optional[str] = None):
+    return security.decode_id(str(id), kind=kind)
 
 
-def encode_with_security(security: IdEncodingHelper, id: Any):
-    return security.encode_id(id)
+def encode_with_security(security: IdEncodingHelper, id: Any, kind: Optional[str] = None):
+    return security.encode_id(id, kind=kind)
 
 
 def get_object(trans, id, class_name, check_ownership=False, check_accessible=False, deleted=None):
diff --git a/lib/galaxy/managers/configuration.py b/lib/galaxy/managers/configuration.py
index c2d2a978b7d..5a2998c583c 100644
--- a/lib/galaxy/managers/configuration.py
+++ b/lib/galaxy/managers/configuration.py
@@ -160,7 +160,6 @@ class ConfigSerializer(base.ModelSerializer):
             "simplified_workflow_run_ui": _use_config,
             "simplified_workflow_run_ui_target_history": _use_config,
             "simplified_workflow_run_ui_job_cache": _use_config,
-            "simplified_workflow_run_ui": _use_config,
             "has_user_tool_filters": _defaults_to(False),
             # TODO: is there no 'correct' way to get an api url? controller='api', action='tools' is a hack
             # at any rate: the following works with path_prefix but is still brittle
@@ -199,6 +198,7 @@ class ConfigSerializer(base.ModelSerializer):
             "enable_celery_tasks": _use_config,
             "user_library_import_dir_available": lambda item, key, **context: bool(item.get("user_library_import_dir")),
             "welcome_directory": _use_config,
+            "themes": _use_config,
         }
 
 
diff --git a/lib/galaxy/managers/export_tracker.py b/lib/galaxy/managers/export_tracker.py
new file mode 100644
index 00000000000..bb0abb3ca7a
--- /dev/null
+++ b/lib/galaxy/managers/export_tracker.py
@@ -0,0 +1,64 @@
+from typing import (
+    List,
+    Optional,
+)
+
+from pydantic import BaseModel
+from sqlalchemy import (
+    and_,
+    select,
+)
+from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.orm.scoping import scoped_session
+
+from galaxy.exceptions import ObjectNotFound
+from galaxy.model import StoreExportAssociation
+from galaxy.schema.schema import ExportObjectType
+from galaxy.structured_app import MinimalManagerApp
+
+
+class StoreExportTracker:
+    """
+    Manages export-related metadata association of different types of exportable objects
+    to remote file sources or repositories.
+    """
+
+    def __init__(self, app: MinimalManagerApp):
+        self.app = app
+
+    @property
+    def session(self) -> scoped_session:
+        return self.app.model.context
+
+    def create_export_association(self, object_id: int, object_type: ExportObjectType) -> StoreExportAssociation:
+        export_association = StoreExportAssociation(object_id=object_id, object_type=object_type)
+        self.session.add(export_association)
+        self.session.flush()
+        return export_association
+
+    def set_export_association_metadata(self, export_association_id: int, export_metadata: BaseModel):
+        try:
+            stmt = select(StoreExportAssociation).where(StoreExportAssociation.id == export_association_id)
+            export_association: StoreExportAssociation = self.session.execute(stmt).scalars().one()
+        except NoResultFound:
+            raise ObjectNotFound("Cannot set export metadata. Reason: Export association not found")
+        export_association.export_metadata = export_metadata.json()
+        self.session.flush()
+
+    def get_object_exports(
+        self, object_id: int, object_type: ExportObjectType, limit: Optional[int] = None, offset: Optional[int] = None
+    ) -> List[StoreExportAssociation]:
+        stmt = (
+            select(
+                StoreExportAssociation,
+            )
+            .where(
+                and_(StoreExportAssociation.object_type == object_type, StoreExportAssociation.object_id == object_id)
+            )
+            .order_by(StoreExportAssociation.create_time.desc())
+        )
+        if offset:
+            stmt = stmt.offset(offset)
+        if limit:
+            stmt = stmt.limit(limit)
+        return self.session.execute(stmt).scalars()
diff --git a/lib/galaxy/managers/hdas.py b/lib/galaxy/managers/hdas.py
index ab4fc15df73..d42bc6d09c7 100644
--- a/lib/galaxy/managers/hdas.py
+++ b/lib/galaxy/managers/hdas.py
@@ -387,6 +387,7 @@ class HDASerializer(  # datasets._UnflattenedMetadataDatasetAssociationSerialize
                 "created_from_basename",
                 "hashes",
                 "sources",
+                "drs_id",
             ],
             include_keys_from="summary",
         )
@@ -461,6 +462,7 @@ class HDASerializer(  # datasets._UnflattenedMetadataDatasetAssociationSerialize
             "created_from_basename": lambda item, key, **context: item.created_from_basename,
             "hashes": lambda item, key, **context: [h.to_dict() for h in item.hashes],
             "sources": lambda item, key, **context: [s.to_dict() for s in item.sources],
+            "drs_id": lambda item, key, **context: f"hda-{self.app.security.encode_id(item.id, kind='drs')}",
         }
         self.serializers.update(serializers)
 
diff --git a/lib/galaxy/managers/histories.py b/lib/galaxy/managers/histories.py
index 2e66215e47c..a0cf15338e6 100644
--- a/lib/galaxy/managers/histories.py
+++ b/lib/galaxy/managers/histories.py
@@ -36,8 +36,11 @@ from galaxy.managers.base import (
     Serializer,
     SortableManager,
 )
+from galaxy.managers.export_tracker import StoreExportTracker
 from galaxy.schema.fields import DecodedDatabaseIdField
 from galaxy.schema.schema import (
+    ExportObjectMetadata,
+    ExportObjectType,
     HDABasicInfo,
     ShareHistoryExtra,
 )
@@ -351,25 +354,63 @@ class HistoryManager(sharable.SharableModelManager, deletable.PurgableManagerMix
                     log.warning(f"User without permissions tried to make dataset with id: {dataset.id} public")
 
 
-class HistoryExportView:
-    def __init__(self, app: MinimalManagerApp):
+class HistoryExportManager:
+    export_object_type = ExportObjectType.HISTORY
+
+    def __init__(self, app: MinimalManagerApp, export_tracker: StoreExportTracker):
         self.app = app
+        self.export_tracker = export_tracker
+
+    def get_task_exports(self, trans, history_id: int, limit: Optional[int] = None, offset: Optional[int] = None):
+        """Returns task-based exports associated with this history"""
+        history = self._history(trans, history_id)
+        export_associations = self.export_tracker.get_object_exports(
+            object_id=history_id, object_type=self.export_object_type, limit=limit, offset=offset
+        )
+        return [self._serialize_task_export(export, history) for export in export_associations]
+
+    def create_export_association(self, history_id: int) -> model.StoreExportAssociation:
+        return self.export_tracker.create_export_association(object_id=history_id, object_type=self.export_object_type)
+
+    def _serialize_task_export(self, export: model.StoreExportAssociation, history: model.History):
+        task_uuid = export.task_uuid
+        export_date = export.create_time
+        history_has_changed = history.update_time > export_date
+        json_metadata = export.export_metadata
+        export_metadata = ExportObjectMetadata.parse_raw(json_metadata) if json_metadata else None
+        is_ready = (
+            export_metadata is not None
+            and export_metadata.result_data is not None
+            and export_metadata.result_data.success
+        )
+        is_export_up_to_date = is_ready and not history_has_changed
+        return {
+            "id": export.id,
+            "ready": is_ready,
+            "preparing": export_metadata is None or export_metadata.result_data is None,
+            "up_to_date": is_export_up_to_date,
+            "task_uuid": task_uuid,
+            "create_time": export_date,
+            "export_metadata": export_metadata,
+        }
 
     def get_exports(self, trans, history_id: int):
+        """Returns job-based exports associated with this history"""
         history = self._history(trans, history_id)
         matching_exports = history.exports
         return [self.serialize(trans, history_id, e) for e in matching_exports]
 
-    def serialize(self, trans, history_id: int, jeha):
+    def serialize(self, trans, history_id: int, jeha: model.JobExportHistoryArchive) -> dict:
         rval = jeha.to_dict()
+        rval["type"] = "job"
         encoded_jeha_id = DecodedDatabaseIdField.encode(jeha.id)
         encoded_history_id = DecodedDatabaseIdField.encode(history_id)
-        api_url = trans.url_builder("history_archive_download", id=encoded_history_id, jeha_id=encoded_jeha_id)
+        api_url = trans.url_builder("history_archive_download", history_id=encoded_history_id, jeha_id=encoded_jeha_id)
         external_url = trans.url_builder(
-            "history_archive_download", id=encoded_history_id, jeha_id="latest", qualified=True
+            "history_archive_download", history_id=encoded_history_id, jeha_id="latest", qualified=True
         )
         external_permanent_url = trans.url_builder(
-            "history_archive_download", id=encoded_history_id, jeha_id=encoded_jeha_id, qualified=True
+            "history_archive_download", history_id=encoded_history_id, jeha_id=encoded_jeha_id, qualified=True
         )
         rval["download_url"] = api_url
         rval["external_download_latest_url"] = external_url
@@ -494,7 +535,7 @@ class HistorySerializer(sharable.SharableModelSerializer, deletable.PurgableSeri
             "nice_size": lambda item, key, **context: item.disk_nice_size,
             "state": self.serialize_history_state,
             "url": lambda item, key, **context: self.url_for(
-                "history", id=self.app.security.encode_id(item.id), context=context
+                "history", history_id=self.app.security.encode_id(item.id), context=context
             ),
             "contents_url": lambda item, key, **context: self.url_for(
                 "history_contents", history_id=self.app.security.encode_id(item.id), context=context
diff --git a/lib/galaxy/managers/history_contents.py b/lib/galaxy/managers/history_contents.py
index 34131c07af7..055a8b94687 100644
--- a/lib/galaxy/managers/history_contents.py
+++ b/lib/galaxy/managers/history_contents.py
@@ -2,6 +2,7 @@
 Heterogenous lists/contents are difficult to query properly since unions are
 not easily made.
 """
+import json
 import logging
 from typing import (
     Any,
@@ -41,6 +42,8 @@ from galaxy.managers import (
     taggable,
     tools,
 )
+from galaxy.managers.job_connections import JobConnectionsManager
+from galaxy.schema import ValueFilterQueryParams
 from galaxy.structured_app import MinimalManagerApp
 from .base import (
     parse_bool,
@@ -525,6 +528,30 @@ class HistoryContentsFilters(
     # surprisingly (but ominously), this works for both content classes in the union that's filtered
     model_class = model.HistoryDatasetAssociation
 
+    def parse_query_filters_with_relations(self, query_filters: ValueFilterQueryParams, history_id):
+        """Parse query filters but consider case where related filter is included."""
+        if query_filters.q and query_filters.qv and "related-eq" in query_filters.q:
+            qv_index = query_filters.q.index("related-eq")
+            qv_hid = query_filters.qv[qv_index]
+
+            # Make new q and qv excluding related filter
+            new_q = [x for i, x in enumerate(query_filters.q) if i != qv_index]
+            new_qv = [x for i, x in enumerate(query_filters.qv) if i != qv_index]
+
+            # Get list of related item hids from job_connections manager
+            job_connections_manager = JobConnectionsManager(self.app.model.session)
+            related = job_connections_manager.get_related_hids(history_id, qv_hid)
+
+            # Make new query_filters with updated list of related hids for given hid
+            new_q.append("related-eq")
+            new_qv.append(json.dumps(related))
+            query_filters_with_relations = ValueFilterQueryParams(
+                q=new_q,
+                qv=new_qv,
+            )
+            return super().parse_query_filters(query_filters_with_relations)
+        return super().parse_query_filters(query_filters)
+
     def _parse_orm_filter(self, attr, op, val):
 
         # we need to use some manual/text/column fu here since some where clauses on the union don't work
@@ -538,6 +565,9 @@ class HistoryContentsFilters(
                     return sql.column("history_content_type") == val
                 raise_filter_err(attr, op, val, "bad op in filter")
 
+            if attr == "related" and op == "eq":
+                return sql.column("hid").in_(json.loads(val))
+
             if attr == "type_id":
                 if op == "eq":
                     return sql.column("type_id") == val
@@ -595,6 +625,7 @@ class HistoryContentsFilters(
         self.orm_filter_parsers.update(
             {
                 "history_content_type": {"op": ("eq")},
+                "related": {"op": ("eq")},
                 "type_id": {"op": ("eq", "in"), "val": self.parse_type_id_list},
                 "hid": {"op": ("eq", "ge", "le", "gt", "lt"), "val": int},
                 # TODO: needs a different val parser - but no way to add to the above
diff --git a/lib/galaxy/managers/interactivetool.py b/lib/galaxy/managers/interactivetool.py
index d091c4fd862..4bce9c88339 100644
--- a/lib/galaxy/managers/interactivetool.py
+++ b/lib/galaxy/managers/interactivetool.py
@@ -163,6 +163,7 @@ class InteractiveToolManager:
                 entry_url=entry["url"],
                 name=entry["name"],
                 requires_domain=entry["requires_domain"],
+                short_token=self.app.config.interactivetools_shorten_url,
             )
             self.sa_session.add(ep)
         if flush:
@@ -294,7 +295,8 @@ class InteractiveToolManager:
                     rval = "{}/{}".format(rval.rstrip("/"), entry_point.entry_url.lstrip("/"))
             else:
                 rval = self.get_entry_point_path(trans, entry_point)
-
+                if not self.app.config.interactivetools_upstream_proxy and self.app.config.interactivetools_proxy_host:
+                    rval = f"{protocol}//{request_host}{rval}"
             return rval
 
     def get_entry_point_subdomain(self, trans, entry_point):
diff --git a/lib/galaxy/managers/job_connections.py b/lib/galaxy/managers/job_connections.py
new file mode 100644
index 00000000000..c52480c93d2
--- /dev/null
+++ b/lib/galaxy/managers/job_connections.py
@@ -0,0 +1,182 @@
+from sqlalchemy import (
+    literal,
+    union,
+)
+from sqlalchemy.sql import (
+    expression,
+    select,
+)
+
+from galaxy import model
+from galaxy.managers.base import get_class
+from galaxy.model.scoped_session import galaxy_scoped_session
+
+
+class JobConnectionsManager:
+    """Get connections graph of inputs and outputs for given item"""
+
+    def __init__(self, sa_session: galaxy_scoped_session):
+        self.sa_session = sa_session
+
+    def get_connections_graph(self, id, src):
+        """Get connections graph of inputs and outputs for given item id"""
+        if src == "HistoryDatasetAssociation":
+            output_selects = self.outputs_derived_from_input_hda(id)
+            input_selects = self.inputs_for_hda(id)
+        elif src == "HistoryDatasetCollectionAssociation":
+            output_selects = self.outputs_derived_from_input_hdca(id)
+            input_selects = self.inputs_for_hdca(id)
+        else:
+            raise Exception(f"Invalid item type {src}")
+        # Execute selects and return graph of inputs and outputs
+        result = {}
+        result["outputs"] = self._get_union_results(*output_selects)
+        result["inputs"] = self._get_union_results(*input_selects)
+        return result
+
+    def get_related_hids(self, history_id, hid):
+        """Get connections graph of inputs and outputs for given item hid from the given history_id"""
+        # Get id(s) and src(s) for the given hid
+        items_by_hid = self.sa_session.execute(
+            select(model.HistoryDatasetAssociation.id, expression.literal("HistoryDatasetAssociation"))
+            .filter_by(history_id=history_id, hid=hid)
+            .union(
+                select(
+                    model.HistoryDatasetCollectionAssociation.id,
+                    expression.literal("HistoryDatasetCollectionAssociation"),
+                ).filter_by(history_id=history_id, hid=hid)
+            )
+        ).all()
+        result = [hid]
+        for item_data in items_by_hid:
+            graph = self.get_connections_graph(id=item_data[0], src=item_data[1])
+            # Add found related items' hids to result list
+            for val in graph["outputs"] + graph["inputs"]:
+                item_class = get_class(val["src"])
+                item = self.sa_session.query(item_class).get(val["id"])
+                result.append(item.hid)
+        return result
+
+    def _get_union_results(self, *selects):
+        result = []
+        for row in self.sa_session.execute(union(*selects)).all():
+            result.append({"src": row.src, "id": row.id})
+        return result
+
+    def outputs_derived_from_input_hda(self, input_hda_id):
+        hda_select = (
+            select(
+                [
+                    literal("HistoryDatasetAssociation").label("src"),
+                    model.JobToOutputDatasetAssociation.dataset_id.label("id"),
+                ]
+            )
+            .join(
+                model.JobToInputDatasetAssociation,
+                model.JobToInputDatasetAssociation.job_id == model.JobToOutputDatasetAssociation.job_id,
+            )
+            .where(model.JobToInputDatasetAssociation.dataset_id == input_hda_id)
+        )
+        hdca_select = (
+            select(
+                [
+                    literal("HistoryDatasetCollectionAssociation").label("src"),
+                    model.JobToOutputDatasetCollectionAssociation.dataset_collection_id.label("id"),
+                ]
+            )
+            .join(
+                model.JobToInputDatasetAssociation,
+                model.JobToInputDatasetAssociation.job_id == model.JobToOutputDatasetCollectionAssociation.job_id,
+            )
+            .where(model.JobToInputDatasetAssociation.dataset_id == input_hda_id)
+        )
+        return hda_select, hdca_select
+
+    def outputs_derived_from_input_hdca(self, input_hdca_id):
+        hda_select = (
+            select(
+                [
+                    literal("HistoryDatasetAssociation").label("src"),
+                    model.JobToOutputDatasetAssociation.dataset_id.label("id"),
+                ]
+            )
+            .join(
+                model.JobToInputDatasetCollectionAssociation,
+                model.JobToInputDatasetCollectionAssociation.job_id == model.JobToOutputDatasetAssociation.job_id,
+            )
+            .where(model.JobToInputDatasetCollectionAssociation.dataset_collection_id == input_hdca_id)
+        )
+        hdca_select = (
+            select(
+                [
+                    literal("HistoryDatasetCollectionAssociation").label("src"),
+                    model.JobToOutputDatasetCollectionAssociation.dataset_collection_id.label("id"),
+                ]
+            )
+            .join(
+                model.JobToInputDatasetCollectionAssociation,
+                model.JobToInputDatasetCollectionAssociation.job_id
+                == model.JobToOutputDatasetCollectionAssociation.job_id,
+            )
+            .where(model.JobToInputDatasetCollectionAssociation.dataset_collection_id == input_hdca_id)
+        )
+        return hda_select, hdca_select
+
+    def inputs_for_hda(self, input_hda_id):
+        input_hdas = (
+            select(
+                [
+                    literal("HistoryDatasetAssociation").label("src"),
+                    model.JobToInputDatasetAssociation.dataset_id.label("id"),
+                ]
+            )
+            .join(
+                model.JobToOutputDatasetAssociation,
+                model.JobToOutputDatasetAssociation.job_id == model.JobToInputDatasetAssociation.job_id,
+            )
+            .where(model.JobToOutputDatasetAssociation.dataset_id == input_hda_id)
+        )
+        input_hdcas = (
+            select(
+                [
+                    literal("HistoryDatasetCollectionAssociation").label("src"),
+                    model.JobToInputDatasetCollectionAssociation.dataset_collection_id.label("id"),
+                ]
+            )
+            .join(
+                model.JobToOutputDatasetAssociation,
+                model.JobToOutputDatasetAssociation.job_id == model.JobToInputDatasetCollectionAssociation.job_id,
+            )
+            .where(model.JobToOutputDatasetAssociation.dataset_id == input_hda_id)
+        )
+        return input_hdas, input_hdcas
+
+    def inputs_for_hdca(self, input_hdca_id):
+        input_hdas = (
+            select(
+                [
+                    literal("HistoryDatasetAssociation").label("src"),
+                    model.JobToInputDatasetAssociation.dataset_id.label("id"),
+                ]
+            )
+            .join(
+                model.JobToOutputDatasetCollectionAssociation,
+                model.JobToOutputDatasetCollectionAssociation.job_id == model.JobToInputDatasetAssociation.job_id,
+            )
+            .where(model.JobToOutputDatasetCollectionAssociation.dataset_collection_id == input_hdca_id)
+        )
+        input_hdcas = (
+            select(
+                [
+                    literal("HistoryDatasetCollectionAssociation").label("src"),
+                    model.JobToInputDatasetCollectionAssociation.dataset_collection_id.label("id"),
+                ]
+            )
+            .join(
+                model.JobToOutputDatasetCollectionAssociation,
+                model.JobToOutputDatasetCollectionAssociation.job_id
+                == model.JobToInputDatasetCollectionAssociation.job_id,
+            )
+            .where(model.JobToOutputDatasetCollectionAssociation.dataset_collection_id == input_hdca_id)
+        )
+        return input_hdas, input_hdcas
diff --git a/lib/galaxy/managers/markdown_parse.py b/lib/galaxy/managers/markdown_parse.py
index 7b2d4c0cdb9..a9b61ddb73c 100644
--- a/lib/galaxy/managers/markdown_parse.py
+++ b/lib/galaxy/managers/markdown_parse.py
@@ -24,6 +24,7 @@ class DynamicArguments:
 
 
 DYNAMIC_ARGUMENTS = DynamicArguments()
+SHARED_ARGUMENTS: List[str] = ["collapse"]
 VALID_ARGUMENTS: Dict[str, Union[List[str], DynamicArguments]] = {
     "history_link": ["history_id"],
     "history_dataset_display": ["input", "output", "history_dataset_id"],
@@ -73,7 +74,7 @@ def validate_galaxy_markdown(galaxy_markdown, internal=True):
     def _validate_arg(arg_str, valid_args, line_no):
         if arg_str is not None:
             arg_name = arg_str.split("=", 1)[0].strip()
-            if arg_name not in valid_args:
+            if arg_name not in valid_args and arg_name not in SHARED_ARGUMENTS:
                 invalid_line("Invalid argument to Galaxy directive [{argument}]", line_no, argument=arg_name)
 
     expecting_container_close_for = None
diff --git a/lib/galaxy/managers/model_stores.py b/lib/galaxy/managers/model_stores.py
index c110ea723c5..7f5abba3b4a 100644
--- a/lib/galaxy/managers/model_stores.py
+++ b/lib/galaxy/managers/model_stores.py
@@ -1,9 +1,13 @@
-from typing import Optional
+from typing import (
+    Optional,
+    Union,
+)
 
 from galaxy import model
 from galaxy.exceptions import RequestParameterInvalidException
 from galaxy.jobs.manager import JobManager
 from galaxy.managers.context import ProvidesUserContext
+from galaxy.managers.export_tracker import StoreExportTracker
 from galaxy.managers.histories import HistoryManager
 from galaxy.managers.users import UserManager
 from galaxy.model.scoped_session import galaxy_scoped_session
@@ -14,7 +18,15 @@ from galaxy.model.store import (
     ObjectImportTracker,
     source_to_import_store,
 )
-from galaxy.schema.schema import HistoryContentType
+from galaxy.schema.schema import (
+    ExportObjectMetadata,
+    ExportObjectRequestMetadata,
+    ExportObjectResultMetadata,
+    ExportObjectType,
+    HistoryContentType,
+    ShortTermStoreExportPayload,
+    WriteStoreToPayload,
+)
 from galaxy.schema.tasks import (
     BcoGenerationTaskParametersMixin,
     GenerateHistoryContentDownload,
@@ -61,6 +73,7 @@ class ModelStoreManager:
         self,
         app: MinimalManagerApp,
         history_manager: HistoryManager,
+        export_tracker: StoreExportTracker,
         sa_session: galaxy_scoped_session,
         job_manager: JobManager,
         short_term_storage_monitor: ShortTermStorageMonitor,
@@ -70,6 +83,7 @@ class ModelStoreManager:
         self._sa_session = sa_session
         self._job_manager = job_manager
         self._history_manager = history_manager
+        self._export_tracker = export_tracker
         self._short_term_storage_monitor = short_term_storage_monitor
         self._user_manager = user_manager
 
@@ -95,13 +109,21 @@ class ModelStoreManager:
         export_files = "symlink" if request.include_files else None
         include_hidden = request.include_hidden
         include_deleted = request.include_deleted
-        with storage_context(
-            request.short_term_storage_request_id, self._short_term_storage_monitor
-        ) as short_term_storage_target:
-            with model.store.get_export_store_factory(self._app, model_store_format, export_files=export_files)(
-                short_term_storage_target.path
-            ) as export_store:
-                export_store.export_history(history, include_hidden=include_hidden, include_deleted=include_deleted)
+        export_metadata = self.set_history_export_request_metadata(request)
+        try:
+            with storage_context(
+                request.short_term_storage_request_id, self._short_term_storage_monitor
+            ) as short_term_storage_target:
+                with model.store.get_export_store_factory(self._app, model_store_format, export_files=export_files)(
+                    short_term_storage_target.path
+                ) as export_store:
+                    export_store.export_history(history, include_hidden=include_hidden, include_deleted=include_deleted)
+                self.set_history_export_result_metadata(request.export_association_id, export_metadata, success=True)
+        except Exception as e:
+            self.set_history_export_result_metadata(
+                request.export_association_id, export_metadata, success=False, error=str(e)
+            )
+            raise
 
     def prepare_history_content_download(self, request: GenerateHistoryContentDownload):
         model_store_format = request.model_store_format
@@ -188,13 +210,54 @@ class ModelStoreManager:
         export_files = "symlink" if request.include_files else None
         target_uri = request.target_uri
         user_context = self._build_user_context(request.user.user_id)
-        with model.store.get_export_store_factory(
-            self._app, model_store_format, export_files=export_files, user_context=user_context
-        )(target_uri) as export_store:
-            history = self._history_manager.by_id(request.history_id)
-            export_store.export_history(
-                history, include_hidden=request.include_hidden, include_deleted=request.include_deleted
+        export_metadata = self.set_history_export_request_metadata(request)
+        try:
+            with model.store.get_export_store_factory(
+                self._app, model_store_format, export_files=export_files, user_context=user_context
+            )(target_uri) as export_store:
+                history = self._history_manager.by_id(request.history_id)
+                export_store.export_history(
+                    history, include_hidden=request.include_hidden, include_deleted=request.include_deleted
+                )
+                self.set_history_export_result_metadata(request.export_association_id, export_metadata, success=True)
+        except Exception as e:
+            self.set_history_export_result_metadata(
+                request.export_association_id, export_metadata, success=False, error=str(e)
             )
+            raise
+
+    def set_history_export_request_metadata(
+        self, request: Union[WriteHistoryTo, GenerateHistoryDownload]
+    ) -> Optional[ExportObjectMetadata]:
+        if request.export_association_id is None:
+            return None
+        request_dict = request.dict()
+        request_payload = (
+            WriteStoreToPayload(**request_dict)
+            if isinstance(request, WriteHistoryTo)
+            else ShortTermStoreExportPayload(**request_dict)
+        )
+        export_metadata = ExportObjectMetadata(
+            request_data=ExportObjectRequestMetadata(
+                object_id=request.history_id,
+                object_type=ExportObjectType.HISTORY,
+                user_id=request.user.user_id,
+                payload=request_payload,
+            ),
+        )
+        self._export_tracker.set_export_association_metadata(request.export_association_id, export_metadata)
+        return export_metadata
+
+    def set_history_export_result_metadata(
+        self,
+        export_association_id: Optional[int],
+        export_metadata: Optional[ExportObjectMetadata],
+        success: bool,
+        error: Optional[str] = None,
+    ):
+        if export_association_id is not None and export_metadata is not None:
+            export_metadata.result_data = ExportObjectResultMetadata(success=success, error=error)
+            self._export_tracker.set_export_association_metadata(export_association_id, export_metadata)
 
     def import_model_store(self, request: ImportModelStoreTaskRequest):
         import_options = ImportOptions(
diff --git a/lib/galaxy/managers/taggable.py b/lib/galaxy/managers/taggable.py
index 196f1df7ac9..31b44574710 100644
--- a/lib/galaxy/managers/taggable.py
+++ b/lib/galaxy/managers/taggable.py
@@ -5,6 +5,7 @@ Mixins for Taggable model managers and serializers.
 # from galaxy import exceptions as galaxy_exceptions
 
 import logging
+import re
 from typing import Type
 
 from sqlalchemy import (
@@ -36,7 +37,9 @@ def _tag_str_gen(item):
 def _tags_to_strings(item):
     if not hasattr(item, "tags"):
         return None
-    return sorted(list(_tag_str_gen(item)))
+    tag_list = list(_tag_str_gen(item))
+    # consider named tags while sorting
+    return sorted(tag_list, key=lambda str: re.sub("^name:", "#", str))
 
 
 def _tags_from_strings(item, tag_handler, new_tags_list, user=None):
diff --git a/lib/galaxy/managers/tasks.py b/lib/galaxy/managers/tasks.py
new file mode 100644
index 00000000000..468cf7f0863
--- /dev/null
+++ b/lib/galaxy/managers/tasks.py
@@ -0,0 +1,58 @@
+from abc import (
+    ABCMeta,
+    abstractmethod,
+)
+from uuid import UUID
+
+from celery.result import AsyncResult
+
+
+class AsyncTasksManager(metaclass=ABCMeta):
+    @abstractmethod
+    def is_ready(self, task_uuid: UUID) -> bool:
+        """Return `True` if the task has executed.
+
+        If the task is still running, pending, or is waiting for retry then `False` is returned.
+        """
+
+    def is_pending(self, task_uuid: UUID) -> bool:
+        """Return `True` if the task is not done yet."""
+        return not self.is_ready(task_uuid)
+
+    @abstractmethod
+    def is_successful(self, task_uuid: UUID) -> bool:
+        """Return `True` if the task executed successfully."""
+
+    @abstractmethod
+    def has_failed(self, task_uuid: UUID) -> bool:
+        """Return `True` if the task failed."""
+
+    @abstractmethod
+    def get_state(self, task_uuid: UUID) -> str:
+        """Returns the current state of the task as a string."""
+
+
+class CeleryAsyncTasksManager(AsyncTasksManager):
+    """Thin wrapper around Celery tasks AsyncResult queries."""
+
+    def is_ready(self, task_uuid: UUID) -> bool:
+        """Return `True` if the task has executed.
+
+        If the task is still running, pending, or is waiting for retry then `False` is returned.
+        """
+        return self._get_result(task_uuid).ready()
+
+    def is_successful(self, task_uuid: UUID) -> bool:
+        """Return `True` if the task executed successfully."""
+        return self._get_result(task_uuid).successful()
+
+    def has_failed(self, task_uuid: UUID) -> bool:
+        """Return `True` if the task failed."""
+        return self._get_result(task_uuid).failed()
+
+    def get_state(self, task_uuid: UUID) -> str:
+        """Returns the tasks current state as a string."""
+        return str(self._get_result(task_uuid).state)
+
+    def _get_result(self, task_uuid: UUID) -> AsyncResult:
+        return AsyncResult(str(task_uuid))
diff --git a/lib/galaxy/managers/tool_data.py b/lib/galaxy/managers/tool_data.py
index 6ee8f904436..e55049d3db0 100644
--- a/lib/galaxy/managers/tool_data.py
+++ b/lib/galaxy/managers/tool_data.py
@@ -6,7 +6,14 @@ from typing import (
 )
 
 from galaxy import exceptions
-from galaxy.structured_app import StructuredApp
+from galaxy.files import ConfiguredFileSources
+from galaxy.files.uris import stream_url_to_file
+from galaxy.model import DatasetInstance
+from galaxy.structured_app import (
+    MinimalManagerApp,
+    StructuredApp,
+)
+from galaxy.tool_util.data import BundleProcessingOptions
 from galaxy.tool_util.data._schema import (
     ToolDataDetails,
     ToolDataEntryList,
@@ -16,6 +23,7 @@ from galaxy.tools.data import (
     TabularToolDataField,
     TabularToolDataTable,
     ToolDataTable,
+    ToolDataTableManager,
 )
 
 
@@ -95,3 +103,42 @@ class ToolDataManager:
     def _reload_data_table(self, name: str) -> ToolDataDetails:
         self._app.queue_worker.send_control_task("reload_tool_data_tables", noop_self=True, kwargs={"table_name": name})
         return self.show(name)
+
+
+class ToolDataImportManager:
+    file_sources: ConfiguredFileSources
+    tool_data_tables: ToolDataTableManager
+
+    def __init__(self, app: MinimalManagerApp):
+        self.file_sources = app.file_sources
+        self.tool_data_tables = app.tool_data_tables
+
+    def import_data_bundle_by_uri(self, config, uri: str):
+        # an admin-only task - so allow file:// uris
+        if uri.startswith("file://"):
+            target = uri[len("file://") :]
+        else:
+            target = stream_url_to_file(
+                uri,
+                self.file_sources,
+            )
+        options = BundleProcessingOptions(
+            what="data import",  # An alternative to this is sticking this in the bundle, only used for logging.
+            data_manager_path=config.galaxy_data_manager_data_path,
+            target_config_file=config.data_manager_config_file,
+        )
+        self.tool_data_tables.import_bundle(
+            target,
+            options,
+        )
+
+    def import_data_bundle_by_dataset(self, config, dataset: DatasetInstance):
+        options = BundleProcessingOptions(
+            what="data import",  # An alternative to this is sticking this in the bundle, only used for logging.
+            data_manager_path=config.galaxy_data_manager_data_path,
+            target_config_file=config.data_manager_config_file,
+        )
+        self.tool_data_tables.import_bundle(
+            dataset.extra_files_path,
+            options,
+        )
diff --git a/lib/galaxy/managers/users.py b/lib/galaxy/managers/users.py
index f29aac5f002..a3b31ec8843 100644
--- a/lib/galaxy/managers/users.py
+++ b/lib/galaxy/managers/users.py
@@ -4,6 +4,7 @@ Manager and Serializer for Users.
 import hashlib
 import logging
 import random
+import re
 import socket
 import time
 from datetime import datetime
@@ -414,7 +415,8 @@ class UserManager(base.ModelManager, deletable.PurgableManagerMixin):
         # boil the tag tuples down into a sorted list of DISTINCT name:val strings
         tags = all_tags_query.distinct().all()
         tags = [(f"{name}:{val}" if val else name) for name, val in tags]
-        return sorted(tags)
+        # consider named tags while sorting
+        return sorted(tags, key=lambda str: re.sub("^name:", "#", str))
 
     def change_password(self, trans, password=None, confirm=None, token=None, id=None, current=None):
         """
diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py
index e062ae3c3c5..f2d88ea5d3f 100644
--- a/lib/galaxy/managers/workflows.py
+++ b/lib/galaxy/managers/workflows.py
@@ -732,6 +732,7 @@ class WorkflowContentsManager(UsesAnnotations):
                     source_metadata["trs_tool_id"] = workflow_state_resolution_options.trs_tool_id
                     source_metadata["trs_version_id"] = workflow_state_resolution_options.trs_version_id
                     source_metadata["trs_server"] = workflow_state_resolution_options.trs_server
+                    source_metadata["trs_url"] = workflow_state_resolution_options.trs_url
                 elif not workflow_state_resolution_options.archive_source.startswith("file://"):  # URL import
                     source_metadata["url"] = workflow_state_resolution_options.archive_source
                 workflow_state_resolution_options.archive_source = None  # so trs_id is not set for subworkflows
@@ -1351,8 +1352,7 @@ class WorkflowContentsManager(UsesAnnotations):
                 "id": step.order_index,
                 "type": module.type,
                 "content_id": content_id,
-                "tool_id": content_id,  # For workflows exported to older Galaxies,
-                # eliminate after a few years...
+                "tool_id": None,
                 "tool_version": module.get_version() if allow_upgrade else step.tool_version,
                 "name": module.get_name(),
                 "tool_state": json.dumps(tool_state),
@@ -1361,6 +1361,8 @@ class WorkflowContentsManager(UsesAnnotations):
                 "label": step.label or None,
                 "annotation": annotation_str,
             }
+            if step.type == "tool":
+                step_dict["tool_id"] = content_id if allow_upgrade else step.tool_id
             # Add tool shed repository information and post-job actions to step dict.
             if isinstance(module, ToolModule):
                 if module.tool and module.tool.tool_shed:
@@ -1900,6 +1902,7 @@ class WorkflowCreateOptions(WorkflowStateResolutionOptions):
     trs_tool_id: str = ""
     trs_version_id: str = ""
     trs_server: str = ""
+    trs_url: str = ""
 
     @property
     def is_importable(self):
diff --git a/lib/galaxy/metadata/__init__.py b/lib/galaxy/metadata/__init__.py
index 49ea525b0d2..828d0758b1b 100644
--- a/lib/galaxy/metadata/__init__.py
+++ b/lib/galaxy/metadata/__init__.py
@@ -17,7 +17,24 @@ from galaxy.util import safe_makedirs
 
 log = getLogger(__name__)
 
-SET_METADATA_SCRIPT = "from galaxy_ext.metadata.set_metadata import set_metadata; set_metadata()"
+SET_METADATA_SCRIPT = """
+import os
+import traceback
+try:
+    from galaxy_ext.metadata.set_metadata import set_metadata; set_metadata()
+except Exception:
+    WORKING_DIRECTORY = os.getcwd()
+    WORKING_PARENT = os.path.join(WORKING_DIRECTORY, os.path.pardir)
+    if not os.path.isdir("working") and os.path.isdir(os.path.join(WORKING_PARENT, "working")):
+        # We're probably in pulsar
+        WORKING_DIRECTORY = WORKING_PARENT
+    METADATA_DIRECTORY = os.path.join(WORKING_DIRECTORY, "metadata")
+    EXPORT_STORE_DIRECTORY = os.path.join(METADATA_DIRECTORY, "outputs_populated")
+    os.makedirs(EXPORT_STORE_DIRECTORY, exist_ok=True)
+    with open(os.path.join(EXPORT_STORE_DIRECTORY, "traceback.txt"), "w") as out:
+        out.write(traceback.format_exc())
+    raise
+"""
 
 
 def get_metadata_compute_strategy(config, job_id, metadata_strategy_override=None, tool_id=None):
diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py
index 07c1b2dd4a6..2d74b52e335 100644
--- a/lib/galaxy/model/__init__.py
+++ b/lib/galaxy/model/__init__.py
@@ -2308,6 +2308,18 @@ class JobImportHistoryArchive(Base, RepresentById):
     history = relationship("History")
 
 
+class StoreExportAssociation(Base, RepresentById):
+    __tablename__ = "store_export_association"
+    __table_args__ = (Index("ix_store_export_object", "object_id", "object_type"),)
+
+    id = Column(Integer, primary_key=True)
+    task_uuid = Column(UUIDType(), index=True, unique=True)
+    create_time = Column(DateTime, default=now)
+    object_type = Column(TrimmedString(32))
+    object_id = Column(Integer)
+    export_metadata = Column(JSONType)
+
+
 class JobContainerAssociation(Base, RepresentById):
     __tablename__ = "job_container_association"
 
@@ -2347,15 +2359,34 @@ class InteractiveToolEntryPoint(Base, Dictifiable, RepresentById):
     modified_time = Column(DateTime, default=now, onupdate=now)
     job = relationship("Job", back_populates="interactivetool_entry_points", uselist=False)
 
-    dict_collection_visible_keys = ["id", "name", "active", "created_time", "modified_time"]
-    dict_element_visible_keys = ["id", "name", "active", "created_time", "modified_time"]
+    dict_collection_visible_keys = [
+        "id",
+        "job_id",
+        "name",
+        "active",
+        "created_time",
+        "modified_time",
+        "output_datasets_ids",
+    ]
+    dict_element_visible_keys = [
+        "id",
+        "job_id",
+        "name",
+        "active",
+        "created_time",
+        "modified_time",
+        "output_datasets_ids",
+    ]
 
-    def __init__(self, requires_domain=True, configured=False, deleted=False, **kwd):
+    def __init__(self, requires_domain=True, configured=False, deleted=False, short_token=False, **kwd):
         super().__init__(**kwd)
         self.requires_domain = requires_domain
         self.configured = configured
         self.deleted = deleted
-        self.token = self.token or uuid4().hex
+        if short_token:
+            self.token = (self.token or uuid4().hex)[:10]
+        else:
+            self.token = self.token or uuid4().hex
         self.info = self.info or {}
 
     @property
@@ -2365,6 +2396,10 @@ class InteractiveToolEntryPoint(Base, Dictifiable, RepresentById):
             return not self.job.finished
         return False
 
+    @property
+    def output_datasets_ids(self):
+        return [da.dataset.id for da in self.job.output_datasets]
+
 
 class GenomeIndexToolData(Base, RepresentById):  # TODO: params arg is lost
     __tablename__ = "genome_index_tool_data"
@@ -4320,9 +4355,6 @@ class DatasetInstance(UsesCreateAndUpdateTime, _HasTable):
     def get_display_applications(self, trans):
         return self.datatype.get_display_applications_by_dataset(self, trans)
 
-    def get_visualizations(self):
-        return self.datatype.get_visualizations(self)
-
     def get_datasources(self, trans):
         """
         Returns datasources for dataset; if datasources are not available
diff --git a/lib/galaxy/model/dataset_collections/structure.py b/lib/galaxy/model/dataset_collections/structure.py
index 7255f25af81..79c85b76edd 100644
--- a/lib/galaxy/model/dataset_collections/structure.py
+++ b/lib/galaxy/model/dataset_collections/structure.py
@@ -97,8 +97,7 @@ class Tree(BaseTree):
                 yield dict_map(get_element, collection_dict)
             else:
                 sub_collections = dict_map(lambda collection: get_element(collection).child_collection, collection_dict)
-                for element in substructure._walk_collections(sub_collections):
-                    yield element
+                yield from substructure._walk_collections(sub_collections)
 
     @property
     def is_leaf(self):
diff --git a/lib/galaxy/model/dataset_collections/types/list.py b/lib/galaxy/model/dataset_collections/types/list.py
index 74a274138c7..6fccedf1728 100644
--- a/lib/galaxy/model/dataset_collections/types/list.py
+++ b/lib/galaxy/model/dataset_collections/types/list.py
@@ -1,5 +1,5 @@
 from galaxy.model import DatasetCollectionElement
-from ..types import BaseDatasetCollectionType
+from . import BaseDatasetCollectionType
 
 
 class ListDatasetCollectionType(BaseDatasetCollectionType):
diff --git a/lib/galaxy/model/dataset_collections/types/paired.py b/lib/galaxy/model/dataset_collections/types/paired.py
index 71e24f471c8..3ac8d7da4d8 100644
--- a/lib/galaxy/model/dataset_collections/types/paired.py
+++ b/lib/galaxy/model/dataset_collections/types/paired.py
@@ -2,7 +2,7 @@ from galaxy.model import (
     DatasetCollectionElement,
     HistoryDatasetAssociation,
 )
-from ..types import BaseDatasetCollectionType
+from . import BaseDatasetCollectionType
 
 FORWARD_IDENTIFIER = "forward"
 REVERSE_IDENTIFIER = "reverse"
diff --git a/lib/galaxy/model/migrations/alembic/env.py b/lib/galaxy/model/migrations/alembic/env.py
index d3da4f4554b..7634448338e 100644
--- a/lib/galaxy/model/migrations/alembic/env.py
+++ b/lib/galaxy/model/migrations/alembic/env.py
@@ -13,6 +13,7 @@ from sqlalchemy import create_engine
 
 from galaxy.model.migrations import (
     GXY,
+    ModelId,
     TSI,
 )
 
@@ -72,7 +73,7 @@ def _run_migrations_invoked_via_script(run_migrations: Callable[[str], None]) ->
     run_migrations(url)
 
 
-def _process_cmd_current(urls: Dict[str, str]) -> bool:
+def _process_cmd_current(urls: Dict[ModelId, str]) -> bool:
     if config.cmd_opts.cmd[0].__name__ == "current":  # type: ignore[union-attr]
         # Run command for each url only if urls are different; otherwise run once.
         are_urls_equal = len(set(urls.values())) == 1
@@ -127,9 +128,11 @@ def _get_url_from_config() -> str:
     return cast(str, url)
 
 
-def _load_urls() -> Dict[str, str]:
-    gxy_url = context.get_x_argument(as_dictionary=True).get(f"{GXY}_url")
-    tsi_url = context.get_x_argument(as_dictionary=True).get(f"{TSI}_url")
+def _load_urls() -> Dict[ModelId, str]:
+    context_dict = cast(Dict, context.get_x_argument(as_dictionary=True))
+    gxy_url = context_dict.get(f"{GXY}_url")
+    tsi_url = context_dict.get(f"{TSI}_url")
+    assert gxy_url and tsi_url
     return {
         GXY: gxy_url,
         TSI: tsi_url,
diff --git a/lib/galaxy/model/migrations/alembic/versions_gxy/59e024ceaca1_add_export_association_table.py b/lib/galaxy/model/migrations/alembic/versions_gxy/59e024ceaca1_add_export_association_table.py
new file mode 100644
index 00000000000..7ffed2daaec
--- /dev/null
+++ b/lib/galaxy/model/migrations/alembic/versions_gxy/59e024ceaca1_add_export_association_table.py
@@ -0,0 +1,44 @@
+"""add export association table
+
+Revision ID: 59e024ceaca1
+Revises: e0e3bb173ee6
+Create Date: 2022-10-12 18:02:34.659770
+
+"""
+from alembic import op
+from sqlalchemy import (
+    Column,
+    DateTime,
+    Integer,
+)
+
+from galaxy.model.custom_types import (
+    JSONType,
+    TrimmedString,
+    UUIDType,
+)
+
+# revision identifiers, used by Alembic.
+revision = "59e024ceaca1"
+down_revision = "e0e3bb173ee6"
+branch_labels = None
+depends_on = None
+
+
+table_name = "store_export_association"
+
+
+def upgrade():
+    op.create_table(
+        table_name,
+        Column("id", Integer, primary_key=True),
+        Column("task_uuid", UUIDType(), index=True, unique=True),
+        Column("create_time", DateTime),
+        Column("object_type", TrimmedString(32)),
+        Column("object_id", Integer),
+        Column("export_metadata", JSONType),
+    )
+
+
+def downgrade():
+    op.drop_table(table_name)
diff --git a/lib/galaxy/model/store/__init__.py b/lib/galaxy/model/store/__init__.py
index 19577c87a8b..a8fdc3af82a 100644
--- a/lib/galaxy/model/store/__init__.py
+++ b/lib/galaxy/model/store/__init__.py
@@ -107,6 +107,7 @@ from ._bco_convert_utils import (
     bco_workflow_version,
     SoftwarePrerequisteTracker,
 )
+from .ro_crate_utils import WorkflowRunCrateProfileBuilder
 from ..custom_types import json_encoder
 from ..item_attrs import (
     add_item_annotation,
@@ -297,7 +298,8 @@ class ModelImportStore(metaclass=abc.ABCMeta):
     def implicit_collection_jobs_properties(self) -> List[Dict[str, Any]]:
         ...
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def object_key(self) -> str:
         """Key used to connect objects in metadata.
 
@@ -2395,8 +2397,12 @@ class WriteCrates:
         return len(self.included_invocations) == 1
 
     def _init_crate(self) -> ROCrate:
-        ro_crate = ROCrate()
+        is_invocation_export = self._is_single_invocation_export()
+        if is_invocation_export:
+            invocation_crate_builder = WorkflowRunCrateProfileBuilder(self)
+            return invocation_crate_builder.build_crate()
 
+        ro_crate = ROCrate()
         markdown_path = os.path.join(self.export_directory, "README.md")
         with open(markdown_path, "w") as f:
             f.write(self._generate_markdown_readme())
@@ -2430,13 +2436,15 @@ class WriteCrates:
         workflows_directory = self.workflows_directory
         if os.path.exists(workflows_directory):
             for filename in os.listdir(workflows_directory):
-                workflow_cls = ComputationalWorkflow if not filename.endswith(".cwl") else WorkflowDescription
+                is_computational_wf = not filename.endswith(".cwl")
+                workflow_cls = ComputationalWorkflow if is_computational_wf else WorkflowDescription
                 lang = "galaxy" if not filename.endswith(".cwl") else "cwl"
                 dest_path = os.path.join("workflows", filename)
+                is_main_entity = is_invocation_export and is_computational_wf
                 ro_crate.add_workflow(
                     source=os.path.join(workflows_directory, filename),
                     dest_path=dest_path,
-                    main=False,
+                    main=is_main_entity,
                     cls=workflow_cls,
                     lang=lang,
                 )
@@ -2941,6 +2949,7 @@ def source_to_import_store(
                     target_path, import_options=import_options, app=app, user=galaxy_user
                 )
             else:
+                # TODO: rocrate.zip is not supported here...
                 raise Exception(f"Unknown model_store_format type encountered {model_store_format}")
 
     return model_import_store
diff --git a/lib/galaxy/model/store/discover.py b/lib/galaxy/model/store/discover.py
index d3bd5475fce..1c3c9a6751b 100644
--- a/lib/galaxy/model/store/discover.py
+++ b/lib/galaxy/model/store/discover.py
@@ -400,25 +400,29 @@ class ModelPersistenceContext(metaclass=abc.ABCMeta):
             else:
                 dataset.set_size(no_extra_files=True)
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def tag_handler(self):
         """Return a galaxy.model.tags.TagHandler-like object for persisting tags."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def user(self):
         """If bound to a database, return the user the datasets should be created for.
 
         Return None otherwise.
         """
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def sa_session(self) -> Optional[ScopedSession]:
         """If bound to a database, return the SQL Alchemy session.
 
         Return None otherwise.
         """
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def permission_provider(self) -> "PermissionProvider":
         """If bound to a database, return the SQL Alchemy session.
 
@@ -429,19 +433,23 @@ class ModelPersistenceContext(metaclass=abc.ABCMeta):
         """No-op, no job context."""
         return None
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def job(self) -> Optional[galaxy.model.Job]:
         """Return associated job object if bound to a job finish context connected to a database."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def metadata_source_provider(self) -> "MetadataSourceProvider":
         """Return associated MetadataSourceProvider object."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def object_store(self) -> ObjectStore:
         """Return object store to use for populating discovered dataset contents."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def flush_per_n_datasets(self) -> Optional[int]:
         pass
 
diff --git a/lib/galaxy/model/store/ro_crate_utils.py b/lib/galaxy/model/store/ro_crate_utils.py
new file mode 100644
index 00000000000..0efbdddefb6
--- /dev/null
+++ b/lib/galaxy/model/store/ro_crate_utils.py
@@ -0,0 +1,366 @@
+import logging
+import os
+from typing import (
+    Any,
+    Dict,
+    Optional,
+)
+
+from rocrate.model.computationalworkflow import (
+    ComputationalWorkflow,
+    WorkflowDescription,
+)
+from rocrate.model.contextentity import ContextEntity
+from rocrate.model.softwareapplication import SoftwareApplication
+from rocrate.rocrate import ROCrate
+
+from galaxy.model import (
+    JobParameter,
+    JobToInputDatasetAssociation,
+    JobToOutputDatasetAssociation,
+    Workflow,
+    WorkflowInvocation,
+    WorkflowInvocationStep,
+    WorkflowRequestInputStepParameter,
+    WorkflowStep,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class WorkflowRunCrateProfileBuilder:
+    def __init__(self, model_store: Any):
+        self.model_store = model_store
+        self.invocation: WorkflowInvocation = model_store.included_invocations[0]
+        self.workflow: Workflow = self.invocation.workflow
+        self.param_type_mapping = {
+            "integer": "Integer",
+            "text": "Text",
+            "float": "Float",
+            "boolean": "Boolean",
+            "genomebuild": "File",
+            "select": "DataType",
+            "color": "Color",
+            "group_tag": "DataType",
+            "data_column": "Text",
+            "hidden": "DataType",
+            "hidden_data": "DataType",
+            "baseurl": "URL",
+            "file": "File",
+            "ftpfile": "File",
+            "data": "File",
+            "data_collection": "Collection",
+            "library_data": "File",
+            "rules": "Text",
+            "directory_uri": "URI",
+            "drill_down": "Text",
+            None: "None",
+        }
+
+        self.ignored_parameter_type = [
+            "queries",
+            "inputs",
+            "input",
+            "input1",
+            "__workflow_invocation_uuid__",
+            "chromInfo",
+            "dbkey",
+            "__input_ext",
+        ]
+        self.pv_entities: Dict[str, Any] = {}
+
+    def build_crate(self):
+        crate = ROCrate()
+        file_entities = self._add_files(crate)
+        self._add_collections(crate, file_entities)
+        self._add_workflows(crate)
+        self._add_engine_run(crate)
+        self._add_actions(crate, file_entities)
+        return crate
+
+    def _add_files(self, crate: ROCrate) -> Dict[int, Any]:
+        file_entities: Dict[int, Any] = {}
+        for dataset, _ in self.model_store.included_datasets.values():
+            if dataset.dataset.id in self.model_store.dataset_id_to_path:
+                filename, _ = self.model_store.dataset_id_to_path[dataset.dataset.id]
+                if not filename:
+                    filename = f"datasets/dataset_{dataset.dataset.uuid}"
+                name = dataset.name
+                encoding_format = dataset.datatype.get_mime()
+                properties = {
+                    "name": name,
+                    "encodingFormat": encoding_format,
+                    "exampleOfWork": {"@id": dataset.dataset.uuid.urn},
+                }
+                file_entity = crate.add_file(
+                    filename,
+                    dest_path=filename,
+                    properties=properties,
+                )
+                file_entities[dataset.dataset.id] = file_entity
+        return file_entities
+
+    def _add_collections(self, crate: ROCrate, file_entities: Dict[int, Any]) -> Dict[int, Any]:
+        collection_entities: Dict[int, Any] = {}
+        for collection in self.model_store.included_collections:
+            name = collection.name
+            dataset_ids = []
+            for dataset in collection.dataset_instances:
+                if dataset.dataset:
+                    dataset_id = file_entities.get(dataset.dataset.id)
+                    if dataset_id:
+                        dataset_ids.append({"@id": dataset_id.id})
+
+            properties = {
+                "name": name,
+                "@type": "Collection",
+                "additionalType": collection.collection.collection_type,
+                "hasPart": dataset_ids,
+            }
+            collection_entity = crate.add(
+                ContextEntity(
+                    crate,
+                    collection.type_id,
+                    properties=properties,
+                )
+            )
+            collection_entities[collection.collection.id] = collection_entity
+
+        crate.root_dataset["mentions"] = [{"@id": coll.id} for coll in collection_entities.values() if coll]
+        return collection_entities
+
+    def _add_workflows(self, crate: ROCrate):
+        workflows_directory = self.model_store.workflows_directory
+
+        if os.path.exists(workflows_directory):
+            for filename in os.listdir(workflows_directory):
+                is_computational_wf = not filename.endswith(".cwl")
+                workflow_cls = ComputationalWorkflow if is_computational_wf else WorkflowDescription
+                lang = "galaxy" if not filename.endswith(".cwl") else "cwl"
+                dest_path = os.path.join("workflows", filename)
+
+                crate.add_workflow(
+                    source=os.path.join(workflows_directory, filename),
+                    dest_path=dest_path,
+                    main=is_computational_wf,
+                    cls=workflow_cls,
+                    lang=lang,
+                )
+
+            crate.license = self.workflow.license or ""
+            crate.mainEntity["name"] = self.workflow.name
+
+    def _add_engine_run(self, crate: ROCrate):
+        roc_engine = crate.add(SoftwareApplication(crate, properties={"name": "Galaxy workflow engine"}))
+        roc_engine_run = crate.add(
+            ContextEntity(
+                crate,
+                properties={
+                    "@type": "OrganizeAction",
+                    "name": f"Run of {roc_engine['name']}",
+                    "startTime": self.invocation.create_time.isoformat(),
+                },
+            )
+        )
+        roc_engine_run["instrument"] = roc_engine
+        self.roc_engine_run = roc_engine_run
+
+    def _add_actions(self, crate: ROCrate, file_entities: Dict[int, Any]):
+        input_formal_params: Dict[int, Any] = {}
+        output_formal_params = []
+        workflow_inputs = []
+        workflow_outputs = []
+
+        for param in self.invocation.input_step_parameters:
+            property_value = self._add_wf_property_value(crate, param)
+            workflow_inputs.append(property_value)
+            formal_param = self._add_formal_parameter(crate, param.workflow_step)
+            input_formal_params[formal_param.id] = formal_param
+
+        for output_step in self.invocation.steps:
+            for job in output_step.jobs:
+                for job_input in job.input_datasets:
+                    formal_param = self._add_formal_parameter_input(crate, job_input)
+                    input_formal_params[formal_param.id] = formal_param
+                    dataset_id = job_input.dataset.dataset.id
+                    input_file_entity = file_entities.get(dataset_id)
+                    workflow_inputs.append(input_file_entity)
+                for job_output in job.output_datasets:
+                    formal_param = self._add_formal_parameter_output(crate, job_output)
+                    output_formal_params.append(formal_param)
+                    dataset_id = job_output.dataset.dataset.id
+                    output_file_entity = file_entities.get(dataset_id)
+                    workflow_outputs.append(output_file_entity)
+                for param in job.parameters:
+                    if param.name not in self.ignored_parameter_type and not param.name.startswith("__"):
+                        property_value = self._add_job_property_value(crate, param)
+                        workflow_inputs.append(property_value)
+                        formal_param = self._add_formal_parameter(crate, output_step.workflow_step, param.name)
+                        input_formal_params[formal_param.id] = formal_param
+            if output_step.workflow_step.type == "parameter_input":
+                property_value = self._add_param_property_value(crate, output_step)
+                workflow_inputs.append(property_value)
+                formal_param = self._add_formal_parameter(crate, output_step.workflow_step)
+                input_formal_params[formal_param.id] = formal_param
+            if output_step.workflow_step.type == "tool":
+                for tool_input in output_step.workflow_step.tool_inputs.keys():
+                    if tool_input not in self.ignored_parameter_type and not tool_input.startswith("__"):
+                        property_value = self._add_tool_property_value(crate, output_step, tool_input)
+                        workflow_inputs.append(property_value)
+                        formal_param = self._add_formal_parameter(crate, output_step.workflow_step, tool_input)
+                        input_formal_params[formal_param.id] = formal_param
+
+        wf_input_param_ids = [{"@id": entity.id} for entity in input_formal_params.values()]
+        crate.mainEntity["input"] = wf_input_param_ids
+        wf_input_ids = [{"@id": input.id} for input in workflow_inputs if input]
+        wf_output_param_ids = [{"@id": entity.id} for entity in output_formal_params]
+        crate.mainEntity["output"] = wf_output_param_ids
+        wf_output_ids = [{"@id": output.id} for output in workflow_outputs if output]
+
+        input_param_value = crate.add(
+            ContextEntity(
+                crate,
+                properties={
+                    "@type": "CreateAction",
+                    "name": self.workflow.name,
+                    "instrument": {"@id": crate.mainEntity["@id"]},
+                    "object": wf_input_ids,
+                    "result": wf_output_ids,
+                },
+            )
+        )
+        self.main_action = input_param_value
+
+    def _add_formal_parameter(self, crate: ROCrate, step: WorkflowStep, tool_input: Optional[str] = None):
+        param_id = ""
+        param_type = None
+        if not tool_input:
+            if step.output_connections:
+                param_id = step.output_connections[0].input_name
+            if step.annotations:
+                param_type = step.annotations[0].workflow_step.tool_inputs.get("parameter_type")
+            if step.tool_inputs:
+                param_type = param_type or step.tool_inputs.get("parameter_type")
+        else:
+            param_id = tool_input
+
+        return crate.add(
+            ContextEntity(
+                crate,
+                f"{param_id}-param",
+                properties={
+                    "@type": "FormalParameter",
+                    "additionalType": self.param_type_mapping[param_type],
+                    "description": step.annotations[0].annotation if step.annotations else "",
+                    "name": f"{step.label} parameter",
+                    "valueRequired": not step.input_optional,
+                },
+            )
+        )
+
+    def _add_formal_parameter_input(self, crate: ROCrate, input: JobToInputDatasetAssociation):
+        return crate.add(
+            ContextEntity(
+                crate,
+                input.dataset.dataset.uuid.urn,
+                properties={
+                    "@type": "FormalParameter",
+                    "additionalType": "File",  # TODO: always a dataset/File?
+                    "description": input.dataset.annotations[0].annotation
+                    if input.dataset.annotations
+                    else input.dataset.info or "",
+                    "name": input.name,
+                },
+            )
+        )
+
+    def _add_formal_parameter_output(self, crate: ROCrate, output: JobToOutputDatasetAssociation):
+        return crate.add(
+            ContextEntity(
+                crate,
+                output.dataset.dataset.uuid.urn,
+                properties={
+                    "@type": "FormalParameter",
+                    "additionalType": "File",  # TODO: always a dataset/File?
+                    "description": output.dataset.annotations[0].annotation
+                    if output.dataset.annotations
+                    else output.dataset.info or "",
+                    "name": output.name,
+                },
+            )
+        )
+
+    def _add_job_property_value(self, crate: ROCrate, param: JobParameter):
+        input_name = param.name
+        if self.pv_entities.get(input_name):
+            return
+        job_pv = crate.add(
+            ContextEntity(
+                crate,
+                f"{input_name}-pv",
+                properties={
+                    "@type": "PropertyValue",
+                    "name": input_name,
+                    "value": param.value,
+                    "exampleOfWork": {"@id": f"#{input_name}-param"},
+                },
+            )
+        )
+        self.pv_entities[input_name] = job_pv
+        return job_pv
+
+    def _add_wf_property_value(self, crate: ROCrate, param: WorkflowRequestInputStepParameter):
+        input_name = param.workflow_step.output_connections[0].input_name
+        if self.pv_entities.get(input_name):
+            return
+        wf_pv = crate.add(
+            ContextEntity(
+                crate,
+                f"{input_name}-pv",
+                properties={
+                    "@type": "PropertyValue",
+                    "name": input_name,
+                    "value": param.parameter_value,
+                    "exampleOfWork": {"@id": f"#{input_name}-param"},
+                },
+            )
+        )
+        self.pv_entities[input_name] = wf_pv
+        return wf_pv
+
+    def _add_tool_property_value(self, crate: ROCrate, invocation_step: WorkflowInvocationStep, tool_input: str):
+        if self.pv_entities.get(tool_input):
+            return
+        tool_pv = crate.add(
+            ContextEntity(
+                crate,
+                f"{tool_input}-pv",
+                properties={
+                    "@type": "PropertyValue",
+                    "name": tool_input,
+                    "value": invocation_step.workflow_step.tool_inputs[tool_input],
+                    "exampleOfWork": {"@id": f"#{tool_input}-param"},
+                },
+            )
+        )
+        self.pv_entities[tool_input] = tool_pv
+        return tool_pv
+
+    def _add_param_property_value(self, crate: ROCrate, invocation_step: WorkflowInvocationStep):
+        input_name = invocation_step.workflow_step.output_connections[0].input_name
+        if self.pv_entities.get(input_name):
+            return
+        param_pv = crate.add(
+            ContextEntity(
+                crate,
+                f"{input_name}-pv",
+                properties={
+                    "@type": "PropertyValue",
+                    "name": invocation_step.workflow_step.label,
+                    "value": invocation_step.output_value.value,
+                    "exampleOfWork": {"@id": f"#{input_name}-param"},
+                },
+            )
+        )
+        self.pv_entities[input_name] = param_pv
+        return param_pv
diff --git a/lib/galaxy/navigation/components.py b/lib/galaxy/navigation/components.py
index 7336012e8c3..9124ea687dd 100644
--- a/lib/galaxy/navigation/components.py
+++ b/lib/galaxy/navigation/components.py
@@ -1,9 +1,6 @@
+import abc
 import re
 import string
-from abc import (
-    ABCMeta,
-    abstractproperty,
-)
 from enum import Enum
 from typing import (
     Dict,
@@ -40,12 +37,14 @@ class LocatorT(NamedTuple):
             return str(by.value)
 
 
-class Target(metaclass=ABCMeta):
-    @abstractproperty
+class Target(metaclass=abc.ABCMeta):
+    @property
+    @abc.abstractmethod
     def description(self) -> str:
         """Return a plain-text description of the browser target for logging/messages."""
 
-    @abstractproperty
+    @property
+    @abc.abstractmethod
     def component_locator(self) -> LocatorT:
         """Return a (by, selector) Selenium elment locator tuple for this selector."""
 
diff --git a/lib/galaxy/objectstore/azure_blob.py b/lib/galaxy/objectstore/azure_blob.py
index 7326d506781..daefbd71922 100644
--- a/lib/galaxy/objectstore/azure_blob.py
+++ b/lib/galaxy/objectstore/azure_blob.py
@@ -28,7 +28,7 @@ from galaxy.util import (
 )
 from galaxy.util.path import safe_relpath
 from galaxy.util.sleeper import Sleeper
-from ..objectstore import (
+from . import (
     ConcreteObjectStore,
     convert_bytes,
 )
diff --git a/lib/galaxy/objectstore/cloud.py b/lib/galaxy/objectstore/cloud.py
index 26986eb2114..5835fc000b0 100644
--- a/lib/galaxy/objectstore/cloud.py
+++ b/lib/galaxy/objectstore/cloud.py
@@ -23,11 +23,11 @@ from galaxy.util import (
     unlink,
 )
 from galaxy.util.sleeper import Sleeper
-from .s3 import parse_config_xml
-from ..objectstore import (
+from . import (
     ConcreteObjectStore,
     convert_bytes,
 )
+from .s3 import parse_config_xml
 
 try:
     from cloudbridge.factory import (
diff --git a/lib/galaxy/objectstore/irods.py b/lib/galaxy/objectstore/irods.py
index c885662600a..cf0f8a7770d 100644
--- a/lib/galaxy/objectstore/irods.py
+++ b/lib/galaxy/objectstore/irods.py
@@ -30,7 +30,7 @@ from galaxy.util import (
     unlink,
 )
 from galaxy.util.path import safe_relpath
-from ..objectstore import DiskObjectStore
+from . import DiskObjectStore
 
 IRODS_IMPORT_MESSAGE = "The Python irods package is required to use this feature, please install it"
 # 1 MB
diff --git a/lib/galaxy/objectstore/pithos.py b/lib/galaxy/objectstore/pithos.py
index 6f8094026f7..f28baf6c31d 100644
--- a/lib/galaxy/objectstore/pithos.py
+++ b/lib/galaxy/objectstore/pithos.py
@@ -26,7 +26,7 @@ from galaxy.util import (
     umask_fix_perms,
 )
 from galaxy.util.path import safe_relpath
-from ..objectstore import ConcreteObjectStore
+from . import ConcreteObjectStore
 
 NO_KAMAKI_ERROR_MESSAGE = (
     "ObjectStore configured, but no kamaki.clients dependency available."
diff --git a/lib/galaxy/objectstore/pulsar.py b/lib/galaxy/objectstore/pulsar.py
index 39a54ca5650..04eab33d5fa 100644
--- a/lib/galaxy/objectstore/pulsar.py
+++ b/lib/galaxy/objectstore/pulsar.py
@@ -1,4 +1,4 @@
-from ..objectstore import BaseObjectStore
+from . import BaseObjectStore
 
 try:
     from pulsar.client.manager import ObjectStoreClientManager
diff --git a/lib/galaxy/objectstore/s3.py b/lib/galaxy/objectstore/s3.py
index c1e83643827..01efc4a2152 100644
--- a/lib/galaxy/objectstore/s3.py
+++ b/lib/galaxy/objectstore/s3.py
@@ -32,11 +32,11 @@ from galaxy.util import (
 )
 from galaxy.util.path import safe_relpath
 from galaxy.util.sleeper import Sleeper
-from .s3_multipart_upload import multipart_upload
-from ..objectstore import (
+from . import (
     ConcreteObjectStore,
     convert_bytes,
 )
+from .s3_multipart_upload import multipart_upload
 
 NO_BOTO_ERROR_MESSAGE = (
     "S3/Swift object store configured, but no boto dependency available."
diff --git a/lib/galaxy/quota/_schema.py b/lib/galaxy/quota/_schema.py
index 1274d1d6724..e2881570216 100644
--- a/lib/galaxy/quota/_schema.py
+++ b/lib/galaxy/quota/_schema.py
@@ -5,10 +5,7 @@ from typing import (
 )
 
 from pydantic import Field
-from typing_extensions import (
-    Annotated,
-    Literal,
-)
+from typing_extensions import Literal
 
 from galaxy.schema.fields import (
     DecodedDatabaseIdField,
@@ -70,7 +67,7 @@ QuotaOperationField = Field(
 
 
 class DefaultQuota(Model):  # TODO: should this replace lib.galaxy.model.DefaultQuotaAssociation at some point?
-    model_class: Annotated[DEFAULT_QUOTA_ASSOCIATION, ModelClassField()]
+    model_class: DEFAULT_QUOTA_ASSOCIATION = ModelClassField(DEFAULT_QUOTA_ASSOCIATION)
     type: DefaultQuotaTypes = Field(
         ...,
         title="Type",
@@ -83,7 +80,7 @@ class DefaultQuota(Model):  # TODO: should this replace lib.galaxy.model.Default
 
 
 class UserQuota(Model):
-    model_class: Annotated[USER_QUOTA_ASSOCIATION, ModelClassField()]
+    model_class: USER_QUOTA_ASSOCIATION = ModelClassField(USER_QUOTA_ASSOCIATION)
     user: UserModel = Field(
         ...,
         title="User",
@@ -92,7 +89,7 @@ class UserQuota(Model):
 
 
 class GroupQuota(Model):
-    model_class: Annotated[GROUP_QUOTA_ASSOCIATION, ModelClassField()]
+    model_class: GROUP_QUOTA_ASSOCIATION = ModelClassField(GROUP_QUOTA_ASSOCIATION)
     group: GroupModel = Field(
         ...,
         title="Group",
@@ -103,7 +100,7 @@ class GroupQuota(Model):
 class QuotaBase(Model):
     """Base model containing common fields for Quotas."""
 
-    model_class: Annotated[QUOTA, ModelClassField()]
+    model_class: QUOTA = ModelClassField(QUOTA)
     id: DecodedDatabaseIdField = Field(
         ...,
         title="ID",
diff --git a/lib/galaxy/schema/bco/description_domain.py b/lib/galaxy/schema/bco/description_domain.py
index 72e4eac9ca8..bbe0bc0bf97 100644
--- a/lib/galaxy/schema/bco/description_domain.py
+++ b/lib/galaxy/schema/bco/description_domain.py
@@ -21,8 +21,8 @@ from pydantic import (
 
 
 class XrefItem(BaseModel):
-    namespace: str = Field(..., description="External resource vendor prefix", examples=["pubchem.compound"])
-    name: str = Field(..., description="Name of external reference", examples=["PubChem-compound"])
+    namespace: str = Field(..., description="External resource vendor prefix", example=["pubchem.compound"])
+    name: str = Field(..., description="Name of external reference", example=["PubChem-compound"])
     ids: List[str] = Field(..., description="List of reference identifiers")
     access_time: datetime = Field(..., description="Date and time the external reference was accessed")
 
@@ -68,14 +68,14 @@ class Contributor(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    name: str = Field(..., description="Name of contributor", examples=["Charles Darwin"])
+    name: str = Field(..., description="Name of contributor", example=["Charles Darwin"])
     affiliation: Optional[str] = Field(
-        None, description="Organization the particular contributor is affiliated with", examples=["HMS Beagle"]
+        None, description="Organization the particular contributor is affiliated with", example=["HMS Beagle"]
     )
     email: Optional[EmailStr] = Field(
         None,
         description="electronic means for identification and communication purposes",
-        examples=["name@example.edu"],
+        example=["name@example.edu"],
     )
     contribution: List[ContributionEnum] = Field(
         ..., description="type of contribution determined according to PAV ontology"
@@ -83,13 +83,13 @@ class Contributor(BaseModel):
     orcid: Optional[AnyUrl] = Field(
         None,
         description="Field to record author information. ORCID identifiers allow for the author to curate their information after submission. ORCID identifiers must be valid and must have the prefix ‘https://orcid.org/’",
-        examples=["http://orcid.org/0000-0002-1825-0097"],
+        example=["http://orcid.org/0000-0002-1825-0097"],
     )
 
 
 class PrerequisiteItem(BaseModel):
     name: str = Field(
-        ..., description="Public searchable name for reference or prereq.", examples=["Hepatitis C virus genotype 1"]
+        ..., description="Public searchable name for reference or prereq.", example=["Hepatitis C virus genotype 1"]
     )
     uri: Uri
 
@@ -102,14 +102,14 @@ class PipelineStep(BaseModel):
         ...,
         description="Non-negative integer value representing the position of the tool in a one-dimensional representation of the pipeline.",
     )
-    name: str = Field(..., description="This is a recognized name of the software tool", examples=["HIVE-hexagon"])
+    name: str = Field(..., description="This is a recognized name of the software tool", example=["HIVE-hexagon"])
     description: str = Field(
-        ..., description="Specific purpose of the tool.", examples=["Alignment of reads to a set of references"]
+        ..., description="Specific purpose of the tool.", example=["Alignment of reads to a set of references"]
     )
     version: Optional[str] = Field(
         None,
         description="Version assigned to the instance of the tool used corresponding to the upstream release.",
-        examples=["1.3"],
+        example=["1.3"],
     )
     prerequisite: Optional[List[PrerequisiteItem]] = Field(None, description="Reference or required prereqs")
     input_list: List[Uri] = Field(..., description="URIs (expressed as a URN or URL) of the input files for each tool.")
diff --git a/lib/galaxy/schema/bco/execution_domain.py b/lib/galaxy/schema/bco/execution_domain.py
index 16526176ba8..88f8621e013 100644
--- a/lib/galaxy/schema/bco/execution_domain.py
+++ b/lib/galaxy/schema/bco/execution_domain.py
@@ -26,12 +26,12 @@ class ExternalDataEndpoint(BaseModel):
         extra = Extra.forbid
 
     name: str = Field(
-        ..., description="Description of the service that is accessed", examples=["HIVE", "access to e-utils"]
+        ..., description="Description of the service that is accessed", example=["HIVE", "access to e-utils"]
     )
     url: str = Field(
         ...,
         description="The endpoint to be accessed.",
-        examples=["https://hive.biochemistry.gwu.edu/dna.cgi?cmd=login"],
+        example=["https://hive.biochemistry.gwu.edu/dna.cgi?cmd=login"],
     )
 
 
@@ -76,14 +76,14 @@ class Contributor(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    name: str = Field(..., description="Name of contributor", examples=["Charles Darwin"])
+    name: str = Field(..., description="Name of contributor", example=["Charles Darwin"])
     affiliation: Optional[str] = Field(
-        None, description="Organization the particular contributor is affiliated with", examples=["HMS Beagle"]
+        None, description="Organization the particular contributor is affiliated with", example=["HMS Beagle"]
     )
     email: Optional[EmailStr] = Field(
         None,
         description="electronic means for identification and communication purposes",
-        examples=["name@example.edu"],
+        example=["name@example.edu"],
     )
     contribution: List[ContributionEnum] = Field(
         ..., description="type of contribution determined according to PAV ontology"
@@ -91,7 +91,7 @@ class Contributor(BaseModel):
     orcid: Optional[AnyUrl] = Field(
         None,
         description="Field to record author information. ORCID identifiers allow for the author to curate their information after submission. ORCID identifiers must be valid and must have the prefix ‘https://orcid.org/’",
-        examples=["http://orcid.org/0000-0002-1825-0097"],
+        example=["http://orcid.org/0000-0002-1825-0097"],
     )
 
 
@@ -106,8 +106,8 @@ class SoftwarePrerequisite(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    name: str = Field(..., description="Names of software prerequisites", examples=["HIVE-hexagon"])
-    version: str = Field(..., description="Versions of the software prerequisites", examples=["babajanian.1"])
+    name: str = Field(..., description="Names of software prerequisites", example=["HIVE-hexagon"])
+    version: str = Field(..., description="Versions of the software prerequisites", example=["babajanian.1"])
     uri: Uri
 
 
@@ -122,7 +122,7 @@ class ExecutionDomain(BaseModel):
     script_driver: str = Field(
         ...,
         description="Indication of the kind of executable that can be launched in order to perform a sequence of commands described in the script in order to run the pipelin",
-        examples=["hive", "cwl-runner", "shell"],
+        example=["hive", "cwl-runner", "shell"],
     )
     software_prerequisites: List[SoftwarePrerequisite] = Field(
         ...,
diff --git a/lib/galaxy/schema/bco/io_domain.py b/lib/galaxy/schema/bco/io_domain.py
index 026309ef083..991807ff485 100644
--- a/lib/galaxy/schema/bco/io_domain.py
+++ b/lib/galaxy/schema/bco/io_domain.py
@@ -61,14 +61,14 @@ class Contributor(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    name: str = Field(..., description="Name of contributor", examples=["Charles Darwin"])
+    name: str = Field(..., description="Name of contributor", example=["Charles Darwin"])
     affiliation: Optional[str] = Field(
-        None, description="Organization the particular contributor is affiliated with", examples=["HMS Beagle"]
+        None, description="Organization the particular contributor is affiliated with", example=["HMS Beagle"]
     )
     email: Optional[EmailStr] = Field(
         None,
         description="electronic means for identification and communication purposes",
-        examples=["name@example.edu"],
+        example=["name@example.edu"],
     )
     contribution: List[ContributionEnum] = Field(
         ..., description="type of contribution determined according to PAV ontology"
@@ -76,7 +76,7 @@ class Contributor(BaseModel):
     orcid: Optional[AnyUrl] = Field(
         None,
         description="Field to record author information. ORCID identifiers allow for the author to curate their information after submission. ORCID identifiers must be valid and must have the prefix ‘https://orcid.org/’",
-        examples=["http://orcid.org/0000-0002-1825-0097"],
+        example=["http://orcid.org/0000-0002-1825-0097"],
     )
 
 
@@ -91,7 +91,7 @@ class OutputSubdomainItem(BaseModel):
     mediatype: str = Field(
         ...,
         description="https://www.iana.org/assignments/media-types/",
-        examples=["text/csv"],
+        example=["text/csv"],
         regex="^(.*)$",
         title="mediatype",
     )
diff --git a/lib/galaxy/schema/bco/parametric_domain.py b/lib/galaxy/schema/bco/parametric_domain.py
index 4fd489768e5..920dacf35f8 100644
--- a/lib/galaxy/schema/bco/parametric_domain.py
+++ b/lib/galaxy/schema/bco/parametric_domain.py
@@ -18,18 +18,18 @@ class ParametricDomainItem(BaseModel):
         extra = Extra.forbid
 
     param: str = Field(
-        ..., description="Specific variables for the computational workflow", examples=["seed"], title="param"
+        ..., description="Specific variables for the computational workflow", example=["seed"], title="param"
     )
     value: str = Field(
         ...,
         description="Specific (non-default) parameter values for the computational workflow",
-        examples=["14"],
+        example=["14"],
         title="value",
     )
     step: str = Field(
         ...,
         description="Refers to the specific step of the workflow relevant to the parameters specified in 'param' and 'value'",
-        examples=["1"],
+        example=["1"],
         regex="^(.*)$",
         title="step",
     )
diff --git a/lib/galaxy/schema/bco/provenance_domain.py b/lib/galaxy/schema/bco/provenance_domain.py
index db0a9d867de..af38da7cc09 100644
--- a/lib/galaxy/schema/bco/provenance_domain.py
+++ b/lib/galaxy/schema/bco/provenance_domain.py
@@ -56,14 +56,14 @@ class Contributor(BaseModel):
     class Config:
         extra = Extra.forbid
 
-    name: str = Field(..., description="Name of contributor", examples=["Charles Darwin"])
+    name: str = Field(..., description="Name of contributor", example=["Charles Darwin"])
     affiliation: Optional[str] = Field(
-        None, description="Organization the particular contributor is affiliated with", examples=["HMS Beagle"]
+        None, description="Organization the particular contributor is affiliated with", example=["HMS Beagle"]
     )
     email: Optional[EmailStr] = Field(
         None,
         description="electronic means for identification and communication purposes",
-        examples=["name@example.edu"],
+        example=["name@example.edu"],
     )
     contribution: List[ContributionEnum] = Field(
         ..., description="type of contribution determined according to PAV ontology"
@@ -71,7 +71,7 @@ class Contributor(BaseModel):
     orcid: Optional[AnyUrl] = Field(
         None,
         description="Field to record author information. ORCID identifiers allow for the author to curate their information after submission. ORCID identifiers must be valid and must have the prefix ‘https://orcid.org/’",
-        examples=["http://orcid.org/0000-0002-1825-0097"],
+        example=["http://orcid.org/0000-0002-1825-0097"],
     )
 
 
@@ -105,7 +105,7 @@ class ReviewItem(BaseModel):
     reviewer_comment: Optional[str] = Field(
         None,
         description="Optional free text comment by reviewer",
-        examples=["Approved by research institution staff. Waiting for approval from regulator"],
+        example=["Approved by research institution staff. Waiting for approval from regulator"],
     )
     status: Status = Field(..., description="Current verification status of the IEEE-2791 Object")
 
@@ -117,12 +117,12 @@ class ProvenanceDomain(BaseModel):
     name: str = Field(
         ...,
         description="Public searchable name for IEEE-2791 Object. This public field should take free text value using common biological research terminology supporting the terminology used in the usability_domain, external references (xref), and keywords sections.",
-        examples=["HCV1a ledipasvir resistance SNP detection"],
+        example=["HCV1a ledipasvir resistance SNP detection"],
     )
     version: str = Field(
         ...,
         description="Records the versioning of this IEEE-2791 Object instance. IEEE-2791 Object Version should adhere to semantic versioning as recommended by Semantic Versioning 2.0.0.",
-        examples=["2.9"],
+        example=["2.9"],
     )
     review: Optional[List[ReviewItem]] = Field(
         None,
@@ -149,5 +149,5 @@ class ProvenanceDomain(BaseModel):
     license: str = Field(
         ...,
         description="Creative Commons license or other license information (text) space. The default or recommended license can be Attribution 4.0 International as shown in example",
-        examples=["https://spdx.org/licenses/CC-BY-4.0.html"],
+        example=["https://spdx.org/licenses/CC-BY-4.0.html"],
     )
diff --git a/lib/galaxy/schema/drs/AccessMethod.py b/lib/galaxy/schema/drs/AccessMethod.py
new file mode 100644
index 00000000000..19229d29230
--- /dev/null
+++ b/lib/galaxy/schema/drs/AccessMethod.py
@@ -0,0 +1,57 @@
+# generated by datamodel-codegen:
+#   filename:  https://raw.githubusercontent.com/ga4gh/data-repository-service-schemas/master/openapi/components/schemas/AccessMethod.yaml
+#   timestamp: 2022-05-21T22:19:06+00:00
+
+from __future__ import annotations
+
+from enum import Enum
+from typing import (
+    List,
+    Optional,
+)
+
+from pydantic import (
+    BaseModel,
+    Field,
+)
+
+
+class Type(Enum):
+    s3 = "s3"
+    gs = "gs"
+    ftp = "ftp"
+    gsiftp = "gsiftp"
+    globus = "globus"
+    htsget = "htsget"
+    https = "https"
+    file = "file"
+
+
+class AccessURL(BaseModel):
+    url: str = Field(..., description="A fully resolvable URL that can be used to fetch the actual object bytes.")
+    headers: Optional[List[str]] = Field(
+        None,
+        description="An optional list of headers to include in the HTTP request to `url`. These headers can be used to provide auth tokens required to fetch the object bytes.",
+        example="Authorization: Basic Z2E0Z2g6ZHJz",
+    )
+
+
+class Model(BaseModel):
+    type: Type = Field(..., description="Type of the access method.")
+    access_url: Optional[AccessURL] = Field(
+        None,
+        description="An `AccessURL` that can be used to fetch the actual object bytes. Note that at least one of `access_url` and `access_id` must be provided.",
+    )
+    access_id: Optional[str] = Field(
+        None,
+        description="An arbitrary string to be passed to the `/access` method to get an `AccessURL`. This string must be unique within the scope of a single object. Note that at least one of `access_url` and `access_id` must be provided.",
+    )
+    region: Optional[str] = Field(
+        None,
+        description="Name of the region in the cloud service provider that the object belongs to.",
+        example="us-east-1",
+    )
+
+    # This file is autogenerated but @jmchilton needed to add this manually.
+    class Config:
+        use_enum_values = True  # when using .dict()
diff --git a/lib/galaxy/schema/drs/AccessURL.py b/lib/galaxy/schema/drs/AccessURL.py
new file mode 100644
index 00000000000..b63b16795ec
--- /dev/null
+++ b/lib/galaxy/schema/drs/AccessURL.py
@@ -0,0 +1,24 @@
+# generated by datamodel-codegen:
+#   filename:  https://raw.githubusercontent.com/ga4gh/data-repository-service-schemas/master/openapi/components/schemas/AccessURL.yaml
+#   timestamp: 2022-05-21T22:19:11+00:00
+
+from __future__ import annotations
+
+from typing import (
+    List,
+    Optional,
+)
+
+from pydantic import (
+    BaseModel,
+    Field,
+)
+
+
+class Model(BaseModel):
+    url: str = Field(..., description="A fully resolvable URL that can be used to fetch the actual object bytes.")
+    headers: Optional[List[str]] = Field(
+        None,
+        description="An optional list of headers to include in the HTTP request to `url`. These headers can be used to provide auth tokens required to fetch the object bytes.",
+        example="Authorization: Basic Z2E0Z2g6ZHJz",
+    )
diff --git a/lib/galaxy/schema/drs/Checksum.py b/lib/galaxy/schema/drs/Checksum.py
new file mode 100644
index 00000000000..24cae8b6cac
--- /dev/null
+++ b/lib/galaxy/schema/drs/Checksum.py
@@ -0,0 +1,19 @@
+# generated by datamodel-codegen:
+#   filename:  https://raw.githubusercontent.com/ga4gh/data-repository-service-schemas/master/openapi/components/schemas/Checksum.yaml
+#   timestamp: 2022-05-21T22:19:07+00:00
+
+from __future__ import annotations
+
+from pydantic import (
+    BaseModel,
+    Field,
+)
+
+
+class Model(BaseModel):
+    checksum: str = Field(..., description="The hex-string encoded checksum for the data")
+    type: str = Field(
+        ...,
+        description="The digest method used to create the checksum.\nThe value (e.g. `sha-256`) SHOULD be listed as `Hash Name String` in the https://www.iana.org/assignments/named-information/named-information.xhtml#hash-alg[IANA Named Information Hash Algorithm Registry]. Other values MAY be used, as long as implementors are aware of the issues discussed in https://tools.ietf.org/html/rfc6920#section-9.4[RFC6920].\nGA4GH may provide more explicit guidance for use of non-IANA-registered algorithms in the future. Until then, if implementors do choose such an algorithm (e.g. because it's implemented by their storage provider), they SHOULD use an existing standard `type` value such as `md5`, `etag`, `crc32c`, `trunc512`, or `sha1`.",
+        example="sha-256",
+    )
diff --git a/lib/galaxy/schema/drs/ContentsObject.py b/lib/galaxy/schema/drs/ContentsObject.py
new file mode 100644
index 00000000000..55c93a9520e
--- /dev/null
+++ b/lib/galaxy/schema/drs/ContentsObject.py
@@ -0,0 +1,38 @@
+# generated by datamodel-codegen:
+#   filename:  https://raw.githubusercontent.com/ga4gh/data-repository-service-schemas/master/openapi/components/schemas/ContentsObject.yaml
+#   timestamp: 2022-05-21T22:19:13+00:00
+
+from __future__ import annotations
+
+from typing import (
+    List,
+    Optional,
+)
+
+from pydantic import (
+    BaseModel,
+    Field,
+)
+
+
+class Model(BaseModel):
+    name: str = Field(
+        ...,
+        description="A name declared by the bundle author that must be used when materialising this object, overriding any name directly associated with the object itself. The name must be unique with the containing bundle. This string is made up of uppercase and lowercase letters, decimal digits, hyphen, period, and underscore [A-Za-z0-9.-_]. See http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_282[portable filenames].",
+    )
+    id: Optional[str] = Field(
+        None,
+        description="A DRS identifier of a `DrsObject` (either a single blob or a nested bundle). If this ContentsObject is an object within a nested bundle, then the id is optional. Otherwise, the id is required.",
+    )
+    drs_uri: Optional[List[str]] = Field(
+        None,
+        description="A list of full DRS identifier URI paths that may be used to obtain the object. These URIs may be external to this DRS instance.",
+        example="drs://drs.example.org/314159",
+    )
+    contents: Optional[List[Model]] = Field(
+        None,
+        description='If this ContentsObject describes a nested bundle and the caller specified "?expand=true" on the request, then this contents array must be present and describe the objects within the nested bundle.',
+    )
+
+
+Model.update_forward_refs()
diff --git a/lib/galaxy/schema/drs/DrsObject.py b/lib/galaxy/schema/drs/DrsObject.py
new file mode 100644
index 00000000000..98c98ba3633
--- /dev/null
+++ b/lib/galaxy/schema/drs/DrsObject.py
@@ -0,0 +1,137 @@
+# generated by datamodel-codegen:
+#   filename:  https://raw.githubusercontent.com/ga4gh/data-repository-service-schemas/master/openapi/components/schemas/DrsObject.yaml
+#   timestamp: 2022-05-21T22:19:09+00:00
+
+from __future__ import annotations
+
+from datetime import datetime
+from enum import Enum
+from typing import (
+    List,
+    Optional,
+)
+
+from pydantic import (
+    BaseModel,
+    Field,
+)
+
+
+class Checksum(BaseModel):
+    checksum: str = Field(..., description="The hex-string encoded checksum for the data")
+    type: str = Field(
+        ...,
+        description="The digest method used to create the checksum.\nThe value (e.g. `sha-256`) SHOULD be listed as `Hash Name String` in the https://www.iana.org/assignments/named-information/named-information.xhtml#hash-alg[IANA Named Information Hash Algorithm Registry]. Other values MAY be used, as long as implementors are aware of the issues discussed in https://tools.ietf.org/html/rfc6920#section-9.4[RFC6920].\nGA4GH may provide more explicit guidance for use of non-IANA-registered algorithms in the future. Until then, if implementors do choose such an algorithm (e.g. because it's implemented by their storage provider), they SHOULD use an existing standard `type` value such as `md5`, `etag`, `crc32c`, `trunc512`, or `sha1`.",
+        example="sha-256",
+    )
+
+
+class Type(Enum):
+    s3 = "s3"
+    gs = "gs"
+    ftp = "ftp"
+    gsiftp = "gsiftp"
+    globus = "globus"
+    htsget = "htsget"
+    https = "https"
+    file = "file"
+
+
+class AccessURL(BaseModel):
+    url: str = Field(..., description="A fully resolvable URL that can be used to fetch the actual object bytes.")
+    headers: Optional[List[str]] = Field(
+        None,
+        description="An optional list of headers to include in the HTTP request to `url`. These headers can be used to provide auth tokens required to fetch the object bytes.",
+        example="Authorization: Basic Z2E0Z2g6ZHJz",
+    )
+
+
+class ContentsObject(BaseModel):
+    name: str = Field(
+        ...,
+        description="A name declared by the bundle author that must be used when materialising this object, overriding any name directly associated with the object itself. The name must be unique with the containing bundle. This string is made up of uppercase and lowercase letters, decimal digits, hyphen, period, and underscore [A-Za-z0-9.-_]. See http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_282[portable filenames].",
+    )
+    id: Optional[str] = Field(
+        None,
+        description="A DRS identifier of a `DrsObject` (either a single blob or a nested bundle). If this ContentsObject is an object within a nested bundle, then the id is optional. Otherwise, the id is required.",
+    )
+    drs_uri: Optional[List[str]] = Field(
+        None,
+        description="A list of full DRS identifier URI paths that may be used to obtain the object. These URIs may be external to this DRS instance.",
+        example="drs://drs.example.org/314159",
+    )
+    contents: Optional[List[ContentsObject]] = Field(
+        None,
+        description='If this ContentsObject describes a nested bundle and the caller specified "?expand=true" on the request, then this contents array must be present and describe the objects within the nested bundle.',
+    )
+
+
+class AccessMethod(BaseModel):
+    type: Type = Field(..., description="Type of the access method.")
+    access_url: Optional[AccessURL] = Field(
+        None,
+        description="An `AccessURL` that can be used to fetch the actual object bytes. Note that at least one of `access_url` and `access_id` must be provided.",
+    )
+    access_id: Optional[str] = Field(
+        None,
+        description="An arbitrary string to be passed to the `/access` method to get an `AccessURL`. This string must be unique within the scope of a single object. Note that at least one of `access_url` and `access_id` must be provided.",
+    )
+    region: Optional[str] = Field(
+        None,
+        description="Name of the region in the cloud service provider that the object belongs to.",
+        example="us-east-1",
+    )
+
+
+class Model(BaseModel):
+    id: str = Field(..., description="An identifier unique to this `DrsObject`")
+    name: Optional[str] = Field(
+        None,
+        description="A string that can be used to name a `DrsObject`.\nThis string is made up of uppercase and lowercase letters, decimal digits, hyphen, period, and underscore [A-Za-z0-9.-_]. See http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_282[portable filenames].",
+    )
+    self_uri: str = Field(
+        ...,
+        description="A drs:// hostname-based URI, as defined in the DRS documentation, that tells clients how to access this object.\nThe intent of this field is to make DRS objects self-contained, and therefore easier for clients to store and pass around.  For example, if you arrive at this DRS JSON by resolving a compact identifier-based DRS URI, the `self_uri` presents you with a hostname and properly encoded DRS ID for use in subsequent `access` endpoint calls.",
+        example="drs://drs.example.org/314159",
+    )
+    size: int = Field(
+        ...,
+        description="For blobs, the blob size in bytes.\nFor bundles, the cumulative size, in bytes, of items in the `contents` field.",
+    )
+    created_time: datetime = Field(
+        ...,
+        description="Timestamp of content creation in RFC3339.\n(This is the creation time of the underlying content, not of the JSON object.)",
+    )
+    updated_time: Optional[datetime] = Field(
+        None,
+        description="Timestamp of content update in RFC3339, identical to `created_time` in systems that do not support updates. (This is the update time of the underlying content, not of the JSON object.)",
+    )
+    version: Optional[str] = Field(
+        None,
+        description="A string representing a version.\n(Some systems may use checksum, a RFC3339 timestamp, or an incrementing version number.)",
+    )
+    mime_type: Optional[str] = Field(
+        None, description="A string providing the mime-type of the `DrsObject`.", example="application/json"
+    )
+    checksums: List[Checksum] = Field(
+        ...,
+        description="The checksum of the `DrsObject`. At least one checksum must be provided.\nFor blobs, the checksum is computed over the bytes in the blob.\nFor bundles, the checksum is computed over a sorted concatenation of the checksums of its top-level contained objects (not recursive, names not included). The list of checksums is sorted alphabetically (hex-code) before concatenation and a further checksum is performed on the concatenated checksum value.\nFor example, if a bundle contains blobs with the following checksums:\nmd5(blob1) = 72794b6d\nmd5(blob2) = 5e089d29\nThen the checksum of the bundle is:\nmd5( concat( sort( md5(blob1), md5(blob2) ) ) )\n= md5( concat( sort( 72794b6d, 5e089d29 ) ) )\n= md5( concat( 5e089d29, 72794b6d ) )\n= md5( 5e089d2972794b6d )\n= f7a29a04",
+        min_items=1,
+    )
+    access_methods: Optional[List[AccessMethod]] = Field(
+        None,
+        description="The list of access methods that can be used to fetch the `DrsObject`.\nRequired for single blobs; optional for bundles.",
+        min_items=1,
+    )
+    contents: Optional[List[ContentsObject]] = Field(
+        None,
+        description="If not set, this `DrsObject` is a single blob.\nIf set, this `DrsObject` is a bundle containing the listed `ContentsObject` s (some of which may be further nested).",
+    )
+    description: Optional[str] = Field(None, description="A human readable description of the `DrsObject`.")
+    aliases: Optional[List[str]] = Field(
+        None,
+        description="A list of strings that can be used to find other metadata about this `DrsObject` from external metadata sources. These aliases can be used to represent secondary accession numbers or external GUIDs.",
+    )
+
+
+ContentsObject.update_forward_refs()
diff --git a/lib/galaxy/schema/drs/DrsService.py b/lib/galaxy/schema/drs/DrsService.py
new file mode 100644
index 00000000000..27a7b9bbeec
--- /dev/null
+++ b/lib/galaxy/schema/drs/DrsService.py
@@ -0,0 +1,24 @@
+# generated by datamodel-codegen:
+#   filename:  https://raw.githubusercontent.com/ga4gh/data-repository-service-schemas/master/openapi/components/schemas/DrsService.yaml
+#   timestamp: 2022-05-21T22:19:14+00:00
+
+from __future__ import annotations
+
+from enum import Enum
+
+from pydantic import (
+    BaseModel,
+    Field,
+)
+
+
+class Artifact(Enum):
+    drs = "drs"
+
+
+class Type(BaseModel):
+    artifact: Artifact = Field(..., example="drs")
+
+
+class Model(BaseModel):
+    type: Type
diff --git a/lib/galaxy/schema/drs/Error.py b/lib/galaxy/schema/drs/Error.py
new file mode 100644
index 00000000000..4addcf1fe1b
--- /dev/null
+++ b/lib/galaxy/schema/drs/Error.py
@@ -0,0 +1,19 @@
+# generated by datamodel-codegen:
+#   filename:  https://raw.githubusercontent.com/ga4gh/data-repository-service-schemas/master/openapi/components/schemas/Error.yaml
+#   timestamp: 2022-05-21T22:19:10+00:00
+
+from __future__ import annotations
+
+from typing import Optional
+
+from pydantic import (
+    BaseModel,
+    Field,
+)
+
+
+class Model(BaseModel):
+    msg: Optional[str] = Field(None, description="A detailed error message.")
+    status_code: Optional[int] = Field(
+        None, description="The integer representing the HTTP status code (e.g. 200, 404)."
+    )
diff --git a/lib/galaxy/schema/drs/Service.py b/lib/galaxy/schema/drs/Service.py
new file mode 100644
index 00000000000..05bb1a07d76
--- /dev/null
+++ b/lib/galaxy/schema/drs/Service.py
@@ -0,0 +1,87 @@
+# generated by datamodel-codegen:
+#   filename:  https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-info/v1.0.0/service-info.yaml#/components/schemas/Service
+#   timestamp: 2022-05-22T17:27:36+00:00
+
+from __future__ import annotations
+
+from datetime import datetime
+from typing import Optional
+
+from pydantic import (
+    AnyUrl,
+    BaseModel,
+    Field,
+)
+
+
+class Organization(BaseModel):
+    name: str = Field(
+        ..., description="Name of the organization responsible for the service", example="My organization"
+    )
+    url: AnyUrl = Field(
+        ..., description="URL of the website of the organization (RFC 3986 format)", example="https://example.com"
+    )
+
+
+class ServiceType(BaseModel):
+    group: str = Field(
+        ...,
+        description="Namespace in reverse domain name format. Use `org.ga4gh` for implementations compliant with official GA4GH specifications. For services with custom APIs not standardized by GA4GH, or implementations diverging from official GA4GH specifications, use a different namespace (e.g. your organization's reverse domain name).",
+        example="org.ga4gh",
+    )
+    artifact: str = Field(
+        ...,
+        description="Name of the API or GA4GH specification implemented. Official GA4GH types should be assigned as part of standards approval process. Custom artifacts are supported.",
+        example="beacon",
+    )
+    version: str = Field(
+        ...,
+        description="Version of the API or specification. GA4GH specifications use semantic versioning.",
+        example="1.0.0",
+    )
+
+
+class Service(BaseModel):
+    id: str = Field(
+        ...,
+        description="Unique ID of this service. Reverse domain name notation is recommended, though not required. The identifier should attempt to be globally unique so it can be used in downstream aggregator services e.g. Service Registry.",
+        example="org.ga4gh.myservice",
+    )
+    name: str = Field(..., description="Name of this service. Should be human readable.", example="My project")
+    type: ServiceType
+    description: Optional[str] = Field(
+        None,
+        description="Description of the service. Should be human readable and provide information about the service.",
+        example="This service provides...",
+    )
+    organization: Organization = Field(..., description="Organization providing the service")
+    contactUrl: Optional[AnyUrl] = Field(
+        None,
+        description="URL of the contact for the provider of this service, e.g. a link to a contact form (RFC 3986 format), or an email (RFC 2368 format).",
+        example="mailto:support@example.com",
+    )
+    documentationUrl: Optional[AnyUrl] = Field(
+        None,
+        description="URL of the documentation of this service (RFC 3986 format). This should help someone learn how to use your service, including any specifics required to access data, e.g. authentication.",
+        example="https://docs.myservice.example.com",
+    )
+    createdAt: Optional[datetime] = Field(
+        None,
+        description="Timestamp describing when the service was first deployed and available (RFC 3339 format)",
+        example="2019-06-04T12:58:19Z",
+    )
+    updatedAt: Optional[datetime] = Field(
+        None,
+        description="Timestamp describing when the service was last updated (RFC 3339 format)",
+        example="2019-06-04T12:58:19Z",
+    )
+    environment: Optional[str] = Field(
+        None,
+        description="Environment the service is running in. Use this to distinguish between production, development and testing/staging deployments. Suggested values are prod, test, dev, staging. However this is advised and not enforced.",
+        example="test",
+    )
+    version: str = Field(
+        ...,
+        description="Version of the service being described. Semantic versioning is recommended, but other identifiers, such as dates or commit hashes, are also allowed. The version should be changed whenever the service is updated.",
+        example="1.0.0",
+    )
diff --git a/lib/galaxy/schema/drs/__init__.py b/lib/galaxy/schema/drs/__init__.py
new file mode 100644
index 00000000000..3c6cf9cf26a
--- /dev/null
+++ b/lib/galaxy/schema/drs/__init__.py
@@ -0,0 +1,23 @@
+from .AccessMethod import (
+    Model as AccessMethod,
+    Type as AccessMethodType,
+)
+from .AccessURL import Model as AccessURL
+from .Checksum import Model as Checksum
+from .DrsObject import Model as DrsObject
+from .Service import (
+    Organization as ServiceOrganization,
+    Service,
+    ServiceType,
+)
+
+__all__ = (
+    "AccessMethod",
+    "AccessMethodType",
+    "AccessURL",
+    "Checksum",
+    "DrsObject",
+    "Service",
+    "ServiceOrganization",
+    "ServiceType",
+)
diff --git a/lib/galaxy/schema/drs/gen.sh b/lib/galaxy/schema/drs/gen.sh
new file mode 100644
index 00000000000..4fd13fa14d4
--- /dev/null
+++ b/lib/galaxy/schema/drs/gen.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# must be run from a virtualenv with...
+# https://github.com/koxudaxi/datamodel-code-generator
+for model in AccessMethod Checksum DrsObject Error AccessURL ContentsObject DrsService
+do
+    datamodel-codegen --url "https://raw.githubusercontent.com/ga4gh/data-repository-service-schemas/master/openapi/components/schemas/${model}.yaml" --output "$model.py"
+done
+
+datamodel-codegen --url "https://raw.githubusercontent.com/ga4gh-discovery/ga4gh-service-info/v1.0.0/service-info.yaml#/components/schemas/Service" --output Service.py
diff --git a/lib/galaxy/schema/fields.py b/lib/galaxy/schema/fields.py
index 4dca255c4ad..3bf157237d6 100644
--- a/lib/galaxy/schema/fields.py
+++ b/lib/galaxy/schema/fields.py
@@ -1,6 +1,7 @@
 import re
 
 from pydantic import Field
+from typing_extensions import get_args
 
 from galaxy.security.idencoding import IdEncodingHelper
 
@@ -40,9 +41,9 @@ class BaseDatabaseIdField:
         # __modify_schema__ should mutate the dict it receives in place,
         # the returned value will be ignored
         field_schema.update(
-            min_length=16,
+            minLength=16,
             pattern="[0-9a-fA-F]+",
-            examples=["0123456789ABCDEF"],
+            example=["0123456789ABCDEF"],
             type="string",
         )
 
@@ -94,13 +95,25 @@ class EncodedDatabaseIdField(str, BaseDatabaseIdField):
         return cls.security.decode_id(v)
 
 
-def ModelClassField():
+def literal_to_value(arg):
+    val = get_args(arg)
+    if not val:
+        return arg
+    if len(val) > 1:
+        raise Exception("Can't extract default argument for unions")
+    return val[0]
+
+
+def ModelClassField(default_value=...):
     """Represents a database model class name annotated as a constant
     pydantic Field.
     :param class_name: The name of the database class.
     :return: A constant pydantic Field with default annotations for model classes.
     """
     return Field(
+        literal_to_value(default_value),
         title="Model class",
         description="The name of the database model class.",
+        const=True,
+        mark_required_in_schema=True,
     )
diff --git a/lib/galaxy/schema/schema.py b/lib/galaxy/schema/schema.py
index f252182492f..52eb9f3fafd 100644
--- a/lib/galaxy/schema/schema.py
+++ b/lib/galaxy/schema/schema.py
@@ -1,6 +1,5 @@
 """This module contains general pydantic models and common schema field annotations for them."""
 
-import json
 import re
 from datetime import (
     date,
@@ -61,6 +60,7 @@ JOB_MODEL_CLASS = Literal["Job"]
 STORED_WORKFLOW_MODEL_CLASS = Literal["StoredWorkflow"]
 PAGE_MODEL_CLASS = Literal["Page"]
 
+OptionalNumberT = Optional[Union[int, float]]
 
 # Generic and common Field annotations that can be reused across models
 
@@ -195,6 +195,31 @@ class Model(BaseModel):
             LibraryFolderDatabaseIdField: lambda v: LibraryFolderDatabaseIdField.encode(v),
         }
 
+        @staticmethod
+        def schema_extra(schema: Dict[str, Any], model) -> None:
+            # pydantic doesn't currently allow creating a constant that isn't optional,
+            # which makes sense for validation, but an openapi schema that describes
+            # a response should be able to declare that a field is always present,
+            # even if it is generated from a default value.
+            # Pass `mark_required_in_schema=True` when constructing a pydantic Field instance
+            # to indicate that the field is always present.
+            remove_prop_keys = set()  # hidden items shouldn't be added to schema
+            properties = schema.get("properties", {})
+            for prop_key, prop in properties.items():
+                required_in_schema = prop.pop("mark_required_in_schema", None)
+                hidden = prop.get("hidden")
+                if hidden:
+                    remove_prop_keys.add(prop_key)
+                if required_in_schema:
+                    # const is not valid in response?
+                    prop.pop("const", None)
+                    if "required" in schema:
+                        schema["required"].append(prop_key)
+                    else:
+                        schema["required"] = [prop_key]
+            for prop_key_to_remove in remove_prop_keys:
+                del properties[prop_key_to_remove]
+
 
 class UserModel(Model):
     """User in a transaction context."""
@@ -205,13 +230,13 @@ class UserModel(Model):
     active: bool = Field(title="Active", description="User is active")
     deleted: bool = Field(title="Deleted", description="User is deleted")
     last_password_change: Optional[datetime] = Field(title="Last password change", description="")
-    model_class: Annotated[USER_MODEL_CLASS, ModelClassField()]
+    model_class: USER_MODEL_CLASS = ModelClassField(USER_MODEL_CLASS)
 
 
 class GroupModel(Model):
     """User group model"""
 
-    model_class: Annotated[GROUP_MODEL_CLASS, ModelClassField()]
+    model_class: GROUP_MODEL_CLASS = ModelClassField(GROUP_MODEL_CLASS)
     id: DecodedDatabaseIdField = Field(
         ...,  # Required
         title="ID",
@@ -603,7 +628,7 @@ class HDAExtended(HDADetailed):
 class DCSummary(Model):
     """Dataset Collection summary information."""
 
-    model_class: Annotated[DC_MODEL_CLASS, ModelClassField()]
+    model_class: DC_MODEL_CLASS = ModelClassField(DC_MODEL_CLASS)
     id: DecodedDatabaseIdField = EntityIdField
     create_time: datetime = CreateTimeField
     update_time: datetime = UpdateTimeField
@@ -617,7 +642,7 @@ class HDAObject(Model):
     """History Dataset Association Object"""
 
     id: DecodedDatabaseIdField = EntityIdField
-    model_class: Annotated[HDA_MODEL_CLASS, ModelClassField()]
+    model_class: HDA_MODEL_CLASS = ModelClassField(HDA_MODEL_CLASS)
     state: Dataset.states = DatasetStateField
     hda_ldda: DatasetSourceType = HdaLddaField
     history_id: DecodedDatabaseIdField = HistoryIdField
@@ -630,7 +655,7 @@ class DCObject(Model):
     """Dataset Collection Object"""
 
     id: DecodedDatabaseIdField = EntityIdField
-    model_class: Annotated[DC_MODEL_CLASS, ModelClassField()]
+    model_class: DC_MODEL_CLASS = ModelClassField(DC_MODEL_CLASS)
     collection_type: CollectionType = CollectionTypeField
     populated: Optional[bool] = PopulatedField
     element_count: Optional[int] = ElementCountField
@@ -642,7 +667,7 @@ class DCESummary(Model):
     """Dataset Collection Element summary information."""
 
     id: DecodedDatabaseIdField = EntityIdField
-    model_class: Annotated[DCE_MODEL_CLASS, ModelClassField()]
+    model_class: DCE_MODEL_CLASS = ModelClassField(DCE_MODEL_CLASS)
     element_index: int = Field(
         ...,
         title="Element Index",
@@ -748,7 +773,7 @@ class HDCJobStateSummary(Model):
 class HDCASummary(HistoryItemCommon):
     """History Dataset Collection Association summary information."""
 
-    model_class: Annotated[HDCA_MODEL_CLASS, ModelClassField()]
+    model_class: HDCA_MODEL_CLASS = ModelClassField(HDCA_MODEL_CLASS)
     type: Annotated[
         Literal["collection"],
         Field(
@@ -906,7 +931,7 @@ class UpdateHistoryContentsPayload(HistoryBase):
 class HistorySummary(HistoryBase):
     """History summary information."""
 
-    model_class: Annotated[HISTORY_MODEL_CLASS, ModelClassField()]
+    model_class: HISTORY_MODEL_CLASS = ModelClassField(HISTORY_MODEL_CLASS)
     id: DecodedDatabaseIdField = EntityIdField
     name: str = Field(
         ...,
@@ -1017,40 +1042,9 @@ class HistoryDetailed(HistorySummary):  # Equivalent to 'dev-detailed' view, whi
     )
 
 
-class HistoryBeta(HistoryDetailed):
-    """History detailed information used in the new Beta History."""
-
-    annotation: Optional[str] = AnnotationField
-    empty: bool = Field(
-        ...,
-        title="Empty",
-        description="Whether this History has any content.",
-    )
-    nice_size: str = Field(
-        ..., title="Nice Size", description="Human-readable size of the contents of this history.", example="95.4 MB"
-    )
-    purged: bool = Field(
-        ...,
-        title="Purged",
-        description="Whether this History has been permanently removed.",
-    )
-    tags: TagCollection
-    hid_counter: int = Field(
-        ...,
-        title="HID Counter",
-        description="TODO",
-    )
-    contents_active: HistoryActiveContentCounts = Field(
-        ...,
-        title="Active Contents",
-        description="Contains the number of active, deleted or hidden items in the History.",
-    )
-
-
 AnyHistoryView = Union[
-    HistoryBeta,
-    HistoryDetailed,
     HistorySummary,
+    HistoryDetailed,
     # Any will cover those cases in which only specific `keys` are requested
     # otherwise the validation will fail because the required fields are not returned
     Any,
@@ -1348,6 +1342,11 @@ class StoreExportPayload(Model):
     )
 
 
+class ShortTermStoreExportPayload(StoreExportPayload):
+    short_term_storage_request_id: UUID
+    duration: OptionalNumberT
+
+
 class BcoGenerationParametersMixin(BaseModel):
     bco_merge_history_metadata: bool = Field(
         default=False, description="When reading tags/annotations to generate BCO object include history metadata."
@@ -1378,31 +1377,34 @@ class WriteStoreToPayload(StoreExportPayload):
     )
 
 
-class JobExportHistoryArchiveModel(Model):
-    id: DecodedDatabaseIdField = Field(
+class ObjectExportResponseBase(Model):
+    id: EncodedDatabaseIdField = Field(
         ...,
         title="ID",
-        description="The encoded database ID of the job that is currently processing a particular request.",
-    )
-    job_id: DecodedDatabaseIdField = Field(
-        ...,
-        title="Job ID",
-        description="The encoded database ID of the job that generated this history export archive.",
+        description="The encoded database ID of the export request.",
     )
     ready: bool = Field(
         ...,
         title="Ready",
-        description="Whether the export history job has completed successfully and the archive is ready to download",
+        description="Whether the export has completed successfully and the archive is ready",
     )
     preparing: bool = Field(
         ...,
         title="Preparing",
-        description="Whether the history archive is currently being built or in preparation.",
+        description="Whether the archive is currently being built or in preparation.",
     )
     up_to_date: bool = Field(
         ...,
         title="Up to Date",
-        description="False, if a new export archive should be generated for the corresponding history.",
+        description="False, if a new export archive should be generated.",
+    )
+
+
+class JobExportHistoryArchiveModel(ObjectExportResponseBase):
+    job_id: EncodedDatabaseIdField = Field(
+        ...,
+        title="Job ID",
+        description="The encoded database ID of the job that generated this history export archive.",
     )
     download_url: RelativeUrl = Field(
         ...,
@@ -1421,10 +1423,49 @@ class JobExportHistoryArchiveModel(Model):
     )
 
 
-class JobExportHistoryArchiveCollection(Model):
+class ExportObjectType(str, Enum):
+    """Types of objects that can be exported."""
+
+    HISTORY = "history"
+    INVOCATION = "invocation"
+
+
+class ExportObjectRequestMetadata(Model):
+    object_id: EncodedDatabaseIdField
+    object_type: ExportObjectType
+    user_id: Optional[EncodedDatabaseIdField]
+    payload: Union[WriteStoreToPayload, ShortTermStoreExportPayload]
+
+
+class ExportObjectResultMetadata(Model):
+    success: bool
+    error: Optional[str]
+
+
+class ExportObjectMetadata(Model):
+    request_data: ExportObjectRequestMetadata
+    result_data: Optional[ExportObjectResultMetadata]
+
+
+class ObjectExportTaskResponse(ObjectExportResponseBase):
+    task_uuid: UUID4 = Field(
+        ...,
+        title="Task ID",
+        description="The identifier of the task processing the export.",
+    )
+    create_time: datetime = CreateTimeField
+    export_metadata: Optional[ExportObjectMetadata]
+
+
+class JobExportHistoryArchiveListResponse(Model):
     __root__: List[JobExportHistoryArchiveModel]
 
 
+class ExportTaskListResponse(Model):
+    __root__: List[ObjectExportTaskResponse]
+    __accept_type__ = "application/vnd.galaxy.task.export+json"
+
+
 class LabelValuePair(Model):
     """Generic Label/Value pair model."""
 
@@ -1469,7 +1510,7 @@ class JobIdResponse(Model):
 
 class JobBaseModel(Model):
     id: DecodedDatabaseIdField = EntityIdField
-    model_class: Annotated[JOB_MODEL_CLASS, ModelClassField()]
+    model_class: JOB_MODEL_CLASS = ModelClassField(JOB_MODEL_CLASS)
     tool_id: str = Field(
         ...,
         title="Tool ID",
@@ -1517,15 +1558,15 @@ class ItemStateSummary(Model):
 
 
 class JobStateSummary(ItemStateSummary):
-    model: Annotated[Literal["Job"], ModelClassField()]
+    model: Literal["Job"] = ModelClassField("Job")
 
 
 class ImplicitCollectionJobsStateSummary(ItemStateSummary):
-    model: Annotated[Literal["ImplicitCollectionJobs"], ModelClassField()]
+    model: Literal["ImplicitCollectionJobs"] = ModelClassField("ImplicitCollectionJobs")
 
 
 class WorkflowInvocationStateSummary(ItemStateSummary):
-    model: Annotated[Literal["WorkflowInvocation"], ModelClassField()]
+    model: Literal["WorkflowInvocation"] = ModelClassField("WorkflowInvocation")
 
 
 class JobSummary(JobBaseModel):
@@ -1692,7 +1733,7 @@ class JobFullDetails(JobDetails):
 
 class StoredWorkflowSummary(Model):
     id: DecodedDatabaseIdField = EntityIdField
-    model_class: Annotated[STORED_WORKFLOW_MODEL_CLASS, ModelClassField()]
+    model_class: STORED_WORKFLOW_MODEL_CLASS = ModelClassField(STORED_WORKFLOW_MODEL_CLASS)
     create_time: datetime = CreateTimeField
     update_time: datetime = UpdateTimeField
     name: str = Field(
@@ -2181,7 +2222,7 @@ class BasicRoleModel(Model):
 class RoleModel(BasicRoleModel):
     description: Optional[str] = RoleDescriptionField
     url: RelativeUrl = RelativeUrlField
-    model_class: Annotated[Literal["Role"], ModelClassField()]
+    model_class: Literal["Role"] = ModelClassField("Role")
 
 
 class RoleDefinitionModel(Model):
@@ -2232,12 +2273,30 @@ class GroupUserListModel(Model):
     __root__: List[GroupUserModel]
 
 
+class ImportToolDataBundleUriSource(Model):
+    src: Literal["uri"] = Field(title="src", description="Indicates that the tool data should be resolved by a URI.")
+    uri: str = Field(
+        title="uri",
+        description="URI to fetch tool data bundle from (file:// URIs are fine because this is an admin-only operation)",
+    )
+
+
+class ImportToolDataBundleDatasetSource(Model):
+    src: Literal["hda", "ldda"] = Field(
+        title="src", description="Indicates that the tool data should be resolved from a dataset."
+    )
+    id: DecodedDatabaseIdField = EntityIdField
+
+
+ImportToolDataBundleSource = Union[ImportToolDataBundleDatasetSource, ImportToolDataBundleUriSource]
+
+
 class ToolShedRepository(Model):
     tool_shed_url: str = Field(
         title="Tool Shed URL", default="https://toolshed.g2.bx.psu.edu/", description="Tool Shed target"
     )
-    name: str = Field(name="Name", description="Name of repository")
-    owner: str = Field(name="Owner", description="Owner of repository")
+    name: str = Field(title="Name", description="Name of repository")
+    owner: str = Field(title="Owner", description="Owner of repository")
 
 
 class ToolShedRepositoryChangeset(ToolShedRepository):
@@ -2247,44 +2306,44 @@ class ToolShedRepositoryChangeset(ToolShedRepository):
 class InstalledRepositoryToolShedStatus(Model):
     # See https://github.com/galaxyproject/galaxy/issues/10453
     latest_installable_revision: str = Field(
-        name="Latest installed revision", description="Most recent version avialable on the tool shed"
+        title="Latest installed revision", description="Most recent version available on the tool shed"
     )
     revision_update: str
     revision_upgrade: Optional[str]
     repository_deprecated: str = Field(
-        name="Repository deprecated", description="Repository has been depreciated on the tool shed"
+        title="Repository deprecated", description="Repository has been depreciated on the tool shed"
     )
 
 
 class InstalledToolShedRepository(Model):
-    model_class: Annotated[Literal["ToolShedRepository"], ModelClassField()] = "ToolShedRepository"
+    model_class: Literal["ToolShedRepository"] = ModelClassField("ToolShedRepository")
     id: EncodedDatabaseIdField = Field(
         ...,
         title="ID",
         description="Encoded ID of the install tool shed repository.",
     )
     status: str
-    name: str = Field(name="Name", description="Name of repository")
-    owner: str = Field(name="Owner", description="Owner of repository")
+    name: str = Field(title="Name", description="Name of repository")
+    owner: str = Field(title="Owner", description="Owner of repository")
     deleted: bool
     # This should be an int... but it would break backward compatiblity. Probably switch it at some point anyway?
     ctx_rev: str = Field(
-        name="Changeset revision number",
+        title="Changeset revision number",
         description="The linearized 0-based index of the changeset on the tool shed (0, 1, 2,...)",
     )
     error_message: str = Field("Installation error message, the empty string means no error was recorded")
     installed_changeset_revision: str = Field(
-        name="Installed changeset revision",
+        title="Installed changeset revision",
         description="Initially installed changeset revision. Used to construct path to repository within Galaxies filesystem. Does not change if a repository is updated.",
     )
-    tool_shed: str = Field(name="Tool shed", description="Hostname of the tool shed this was installed from")
+    tool_shed: str = Field(title="Tool shed", description="Hostname of the tool shed this was installed from")
     dist_to_shed: bool
     uninstalled: bool
     changeset_revision: str = Field(
-        name="Changeset revision", description="Changeset revision of the repository - a mercurial commit hash"
+        title="Changeset revision", description="Changeset revision of the repository - a mercurial commit hash"
     )
     tool_shed_status: Optional[InstalledRepositoryToolShedStatus] = Field(
-        name="Latest updated status from the tool shed"
+        title="Latest updated status from the tool shed"
     )
 
 
@@ -2311,7 +2370,7 @@ class LibraryPermissionScope(str, Enum):
 
 
 class LibraryLegacySummary(Model):
-    model_class: Annotated[Literal["Library"], ModelClassField()]
+    model_class: Literal["Library"] = ModelClassField("Library")
     id: DecodedDatabaseIdField = Field(
         ...,
         title="ID",
@@ -2558,7 +2617,7 @@ class LibraryFolderPermissionsPayload(LibraryPermissionsPayloadBase):
 
 
 class LibraryFolderDetails(Model):
-    model_class: Annotated[Literal["LibraryFolder"], ModelClassField()]
+    model_class: Literal["LibraryFolder"] = ModelClassField("LibraryFolder")
     id: LibraryFolderDatabaseIdField = Field(
         ...,
         title="ID",
@@ -2891,31 +2950,6 @@ class HistoryContentStats(Model):
     )
 
 
-class ContentsNearStats(Model):
-    """Stats used by the `contents_near` endpoint."""
-
-    matches: int
-    matches_up: int
-    matches_down: int
-    total_matches: int
-    total_matches_up: int
-    total_matches_down: int
-    max_hid: Optional[int] = None
-    min_hid: Optional[int] = None
-    history_size: int
-    history_empty: bool
-
-    def to_headers(self) -> Dict[str, str]:
-        """Converts all field values to json strings.
-
-        The headers values need to be json strings or updating the response
-        headers will raise encoding errors."""
-        headers = {}
-        for key, val in self:
-            headers[key] = json.dumps(val)
-        return headers
-
-
 class HistoryContentsResult(Model):
     """List of history content items.
     Can contain different views and kinds of items.
@@ -2944,14 +2978,7 @@ class HistoryContentsWithStatsResult(Model):
     __accept_type__ = "application/vnd.galaxy.history.contents.stats+json"
 
 
-class ContentsNearResult(Model):
-    contents: HistoryContentsResult
-    stats: ContentsNearStats
-
-
 # Sharing -----------------------------------------------------------------
-
-
 class SharingOptions(str, Enum):
     """Options for sharing resources that may have restricted access to all or part of their contents."""
 
@@ -3219,7 +3246,7 @@ class PageSummary(PageSummaryBase):
         title="ID",
         description="Encoded ID of the Page.",
     )
-    model_class: Annotated[PAGE_MODEL_CLASS, ModelClassField()]
+    model_class: PAGE_MODEL_CLASS = ModelClassField(PAGE_MODEL_CLASS)
     username: str = Field(
         ...,  # Required
         title="Username",
diff --git a/lib/galaxy/schema/tasks.py b/lib/galaxy/schema/tasks.py
index f7d154694f2..be120cf74b5 100644
--- a/lib/galaxy/schema/tasks.py
+++ b/lib/galaxy/schema/tasks.py
@@ -7,15 +7,15 @@ from pydantic import (
 )
 
 from galaxy.util.hash_util import HashFunctionNameEnum
+from . import PdfDocumentType
 from .schema import (
     BcoGenerationParametersMixin,
     DatasetSourceType,
     HistoryContentType,
     ModelStoreFormat,
-    StoreExportPayload,
+    ShortTermStoreExportPayload,
     WriteStoreToPayload,
 )
-from ..schema import PdfDocumentType
 
 
 class SetupHistoryExportJob(BaseModel):
@@ -46,16 +46,15 @@ class RequestUser(BaseModel):
     # session_id: Optional[str]
 
 
-class GenerateHistoryDownload(StoreExportPayload):
+class GenerateHistoryDownload(ShortTermStoreExportPayload):
     history_id: int
-    short_term_storage_request_id: UUID
     user: RequestUser
+    export_association_id: Optional[int]
 
 
-class GenerateHistoryContentDownload(StoreExportPayload):
+class GenerateHistoryContentDownload(ShortTermStoreExportPayload):
     content_type: HistoryContentType
     content_id: int
-    short_term_storage_request_id: UUID
     user: RequestUser
 
 
@@ -63,9 +62,8 @@ class BcoGenerationTaskParametersMixin(BcoGenerationParametersMixin):
     galaxy_url: str
 
 
-class GenerateInvocationDownload(StoreExportPayload, BcoGenerationTaskParametersMixin):
+class GenerateInvocationDownload(ShortTermStoreExportPayload, BcoGenerationTaskParametersMixin):
     invocation_id: int
-    short_term_storage_request_id: UUID
     user: RequestUser
 
 
@@ -83,6 +81,7 @@ class WriteHistoryContentTo(WriteStoreToPayload):
 class WriteHistoryTo(WriteStoreToPayload):
     history_id: int
     user: RequestUser
+    export_association_id: Optional[int]
 
 
 class ImportModelStoreTaskRequest(BaseModel):
@@ -116,4 +115,4 @@ class ComputeDatasetHashTaskRequest(BaseModel):
     dataset_id: int
     extra_files_path: Optional[str]
     hash_function: HashFunctionNameEnum
-    user: RequestUser
+    user: Optional[RequestUser]  # access checks should be done pre-celery so this is optional
diff --git a/lib/galaxy/security/__init__.py b/lib/galaxy/security/__init__.py
index 0beacd7c4ee..0867f7cc6cf 100644
--- a/lib/galaxy/security/__init__.py
+++ b/lib/galaxy/security/__init__.py
@@ -2,11 +2,24 @@
 Galaxy Security
 
 """
+from typing import (
+    List,
+    Optional,
+)
+
+from typing_extensions import Literal
+
 from galaxy.util.bunch import Bunch
 
+ActionModel = Literal["grant", "restrict"]
+
 
 class Action:
-    def __init__(self, action, description, model):
+    action: str
+    description: str
+    model: ActionModel
+
+    def __init__(self, action: str, description: str, model: ActionModel):
         self.action = action
         self.description = description
         self.model = model
@@ -42,14 +55,14 @@ class RBACAgent:
         ),
     )
 
-    def get_action(self, name, default=None):
+    def get_action(self, name: str, default: Optional[Action] = None) -> Optional[Action]:
         """Get a permitted action by its dict key or action name"""
         for k, v in self.permitted_actions.items():
             if k == name or v.action == name:
                 return v
         return default
 
-    def get_actions(self):
+    def get_actions(self) -> List[Action]:
         """Get all permitted actions as a list of Action objects"""
         return list(self.permitted_actions.__dict__.values())
 
@@ -165,5 +178,5 @@ def get_permitted_actions(filter=None):
     if filter is None:
         return RBACAgent.permitted_actions
     tmp_bunch = Bunch()
-    [tmp_bunch.__dict__.__setitem__(k, v) for k, v in RBACAgent.permitted_actions.items() if k.startswith(filter)]
+    [tmp_bunch.dict().__setitem__(k, v) for k, v in RBACAgent.permitted_actions.items() if k.startswith(filter)]
     return tmp_bunch
diff --git a/lib/galaxy/selenium/navigates_galaxy.py b/lib/galaxy/selenium/navigates_galaxy.py
index ebb40283497..65bee046030 100644
--- a/lib/galaxy/selenium/navigates_galaxy.py
+++ b/lib/galaxy/selenium/navigates_galaxy.py
@@ -658,6 +658,10 @@ class NavigatesGalaxy(HasDriver):
         center_element = self.driver.find_element(By.CSS_SELECTOR, "#center")
         action_chains.move_to_element(center_element).click().perform()
 
+    def hover_over(self, target):
+        action_chains = self.action_chains()
+        action_chains.move_to_element(target).perform()
+
     def perform_upload(self, test_path, **kwd):
         self._perform_upload(test_path=test_path, **kwd)
 
@@ -1393,7 +1397,7 @@ class NavigatesGalaxy(HasDriver):
 
     def tool_parameter_edit_rules(self):
         rules_div_element = self.tool_parameter_div("rules")
-        edit_button_element = rules_div_element.find_element(By.CSS_SELECTOR, "i.fa-edit")
+        edit_button_element = rules_div_element.find_element(By.CSS_SELECTOR, ".form-rules-edit button")
         edit_button_element.click()
 
     def tool_set_value(self, expanded_parameter_id, value, expected_type=None):
@@ -1515,22 +1519,18 @@ class NavigatesGalaxy(HasDriver):
 
     @edit_details
     def history_panel_add_tags(self, tags):
-        tag_icon = self.components.history_panel.tag_icon
-        tag_area = self.components.history_panel.tag_area
-        tag_area_input = self.components.history_panel.tag_area_input
+        tag_area_button = self.components.history_panel.tag_area_button
 
-        # if the tag editor is not present but the tag_icon is, then click it
-        if not tag_icon.is_absent and (tag_area.is_absent or not tag_area.is_displayed):
-            tag_icon.wait_for_and_click()
-
-        input_element = tag_area_input.wait_for_and_click()
-        self.sleep_for(self.wait_types.UX_RENDER)
+        tag_area_button.wait_for_and_click()
+        input_element = self.components.history_panel.tag_area_input.wait_for_visible()
 
         for tag in tags:
             input_element.send_keys(tag)
             self.send_enter(input_element)
             self.sleep_for(self.wait_types.UX_RENDER)
 
+        self.send_escape(input_element)
+
     @edit_details
     def history_panel_rename(self, new_name):
         editable_text_input_element = self.history_panel_name_input()
@@ -1942,7 +1942,7 @@ class NavigatesGalaxy(HasDriver):
                     break
             else:
                 # Pick first match. We're replacing select2 anyway ...
-                select_elem = elem
+                select_elem = candidate_elements[0]
             action_chains = self.action_chains()
             action_chains.move_to_element(select_elem).click().perform()
         self.wait_for_selector_absent_or_hidden("#select2-drop")
diff --git a/lib/galaxy/structured_app.py b/lib/galaxy/structured_app.py
index eaea543fd12..3a592d76d99 100644
--- a/lib/galaxy/structured_app.py
+++ b/lib/galaxy/structured_app.py
@@ -97,6 +97,7 @@ class MinimalManagerApp(MinimalApp):
     file_sources: ConfiguredFileSources
     genome_builds: GenomeBuilds
     dataset_collection_manager: "DatasetCollectionManager"
+    tool_data_tables: "ToolDataTableManager"
     history_manager: "HistoryManager"
     hda_manager: "HDAManager"
     workflow_manager: "WorkflowsManager"
diff --git a/lib/galaxy/tool_util/client/staging.py b/lib/galaxy/tool_util/client/staging.py
index 32c8234d814..ca7d0bf6440 100644
--- a/lib/galaxy/tool_util/client/staging.py
+++ b/lib/galaxy/tool_util/client/staging.py
@@ -269,7 +269,8 @@ class StagingInterface(metaclass=abc.ABCMeta):
     def _log(self, message):
         log.debug(message)
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def use_fetch_api(self):
         """Return true is this should use (modern) data fetch API."""
 
diff --git a/lib/galaxy/tool_util/data/__init__.py b/lib/galaxy/tool_util/data/__init__.py
index 425f6e46253..9a3d69c541b 100644
--- a/lib/galaxy/tool_util/data/__init__.py
+++ b/lib/galaxy/tool_util/data/__init__.py
@@ -15,12 +15,14 @@ import os.path
 import re
 import string
 import time
+from dataclasses import dataclass
 from glob import glob
 from tempfile import NamedTemporaryFile
 from typing import (
     Any,
     BinaryIO,
     Callable,
+    cast,
     Dict,
     List,
     Optional,
@@ -32,6 +34,10 @@ from typing import (
 )
 
 import requests
+from typing_extensions import (
+    Protocol,
+    TypedDict,
+)
 
 from galaxy import util
 from galaxy.exceptions import MessageException
@@ -39,21 +45,29 @@ from galaxy.util import (
     Element,
     RW_R__R__,
 )
+from galaxy.util.compression_utils import decompress_path_to_directory
 from galaxy.util.dictifiable import Dictifiable
 from galaxy.util.filelock import FileLock
 from galaxy.util.path import StrPath
 from galaxy.util.renamed_temporary_file import RenamedTemporaryFile
+from galaxy.util.template import fill_template
 from ._schema import (
     ToolDataEntry,
     ToolDataEntryList,
 )
+from .bundles.models import (
+    DataTableBundle,
+    DataTableBundleProcessorDescription,
+    RepoInfo,
+)
 
 if TYPE_CHECKING:
-    from galaxy.config import GalaxyAppConfiguration
     from galaxy.tools.data_manager.manager import DataManager
 
+
 log = logging.getLogger(__name__)
 
+BUNDLE_INDEX_FILE_NAME = "_gx_data_bundle_index.json"
 DEFAULT_TABLE_TYPE = "tabular"
 
 TOOL_DATA_TABLE_CONF_XML = """<?xml version="1.0"?>
@@ -61,6 +75,15 @@ TOOL_DATA_TABLE_CONF_XML = """<?xml version="1.0"?>
 </tables>
 """
 
+# Internally just the first two - but tool shed code (data_manager_manual) will still
+# pass DataManager in.
+EntrySource = Optional[Union[dict, RepoInfo, "DataManager"]]
+
+
+class StoresConfigFilePaths(Protocol):
+    def get(self, key: Any, default: Optional[Any]) -> Optional[Any]:
+        ...
+
 
 class ToolDataPathFiles:
     update_time: float
@@ -102,9 +125,30 @@ class ToolDataPathFiles:
             return os.path.exists(path)
 
 
+ErrorListT = List[str]
+
+
+class FileNameInfoT(TypedDict):
+    found: bool
+    filename: str
+    from_shed_config: bool
+    tool_data_path: Optional[StrPath]
+    config_element: Optional[Element]
+    tool_shed_repository: Optional[Dict[str, Any]]
+    errors: ErrorListT
+
+
+LoadInfoT = Tuple[Tuple[Element, Optional[StrPath]], Dict[str, Any]]
+
+
 class ToolDataTable(Dictifiable):
     type_key: str
     data: List[List[str]]
+    empty_field_value: str
+    empty_field_values: Dict[Optional[str], str]
+    filenames: Dict[str, FileNameInfoT]
+    _load_info: LoadInfoT
+    _merged_load_info: List[Tuple[Type["ToolDataTable"], LoadInfoT]]
 
     @classmethod
     def from_dict(cls, d):
@@ -123,7 +167,7 @@ class ToolDataTable(Dictifiable):
         tool_data_path_files: ToolDataPathFiles,
         from_shed_config: bool = False,
         filename: Optional[StrPath] = None,
-        other_config_dict: Optional[Union["GalaxyAppConfiguration", Dict[str, Any]]] = None,
+        other_config_dict: Optional[StoresConfigFilePaths] = None,
     ) -> None:
         self.name = config_element.get("name")
         self.comment_char = config_element.get("comment_char")
@@ -131,7 +175,7 @@ class ToolDataTable(Dictifiable):
         self.empty_field_values: Dict[str, str] = {}
         self.allow_duplicate_entries = util.asbool(config_element.get("allow_duplicate_entries", True))
         self.here = os.path.dirname(filename) if filename else None
-        self.filenames: Dict[str, Dict[str, Any]] = {}
+        self.filenames: Dict[str, FileNameInfoT] = {}
         self.tool_data_path = tool_data_path
         self.tool_data_path_files = tool_data_path_files
         self.other_config_dict = other_config_dict or {}
@@ -157,7 +201,7 @@ class ToolDataTable(Dictifiable):
             self._loaded_content_version += 1
         return self._loaded_content_version
 
-    def get_empty_field_by_name(self, name):
+    def get_empty_field_by_name(self, name: Optional[str]) -> str:
         return self.empty_field_values.get(name, self.empty_field_value)
 
     def _add_entry(
@@ -165,7 +209,7 @@ class ToolDataTable(Dictifiable):
         entry: Union[List[str], Dict[str, str]],
         allow_duplicates: bool = True,
         persist: bool = False,
-        entry_source=None,
+        entry_source: EntrySource = None,
         **kwd,
     ) -> None:
         raise NotImplementedError("Abstract method")
@@ -175,14 +219,19 @@ class ToolDataTable(Dictifiable):
         entry: Union[List[str], Dict[str, str]],
         allow_duplicates: bool = True,
         persist: bool = False,
-        entry_source=None,
+        entry_source: EntrySource = None,
         **kwd,
     ) -> int:
         self._add_entry(entry, allow_duplicates=allow_duplicates, persist=persist, entry_source=entry_source, **kwd)
         return self._update_version()
 
     def add_entries(
-        self, entries: List[List[str]], allow_duplicates: bool = True, persist: bool = False, entry_source=None, **kwd
+        self,
+        entries: List[List[str]],
+        allow_duplicates: bool = True,
+        persist: bool = False,
+        entry_source: EntrySource = None,
+        **kwd,
     ) -> int:
         for entry in entries:
             try:
@@ -208,7 +257,6 @@ class ToolDataTable(Dictifiable):
         other_table: "ToolDataTable",
         allow_duplicates: bool = True,
         persist: bool = False,
-        entry_source=None,
         **kwd,
     ) -> int:
         raise NotImplementedError("Abstract method")
@@ -251,7 +299,7 @@ class TabularToolDataTable(ToolDataTable):
         tool_data_path_files: ToolDataPathFiles,
         from_shed_config: bool = False,
         filename: Optional[StrPath] = None,
-        other_config_dict: Optional[Union["GalaxyAppConfiguration", Dict[str, Any]]] = None,
+        other_config_dict: Optional[StoresConfigFilePaths] = None,
     ) -> None:
         super().__init__(
             config_element,
@@ -355,7 +403,7 @@ class TabularToolDataTable(ToolDataTable):
                         filename = f"{corrected_filename}.sample"
                         found = True
 
-            errors: List[str] = []
+            errors: ErrorListT = []
             if found:
                 self.extend_data_with(filename, errors=errors)
                 self._update_version()
@@ -387,7 +435,7 @@ class TabularToolDataTable(ToolDataTable):
             if tmp_file is not None:
                 tmp_file.close()
 
-    def merge_tool_data_table(self, other_table, allow_duplicates=True, persist=False, entry_source=None, **kwd):
+    def merge_tool_data_table(self, other_table, allow_duplicates=True, persist=False, **kwd):
         assert (
             self.columns == other_table.columns
         ), f"Merging tabular data tables with non matching columns is not allowed: {self.name}:{self.columns} != {other_table.name}:{other_table.columns}"
@@ -406,9 +454,7 @@ class TabularToolDataTable(ToolDataTable):
             self.allow_duplicate_entries = False
             self._deduplicate_data()
         # add data entries and return current data table version
-        return self.add_entries(
-            other_table.data, allow_duplicates=allow_duplicates, persist=persist, entry_source=entry_source, **kwd
-        )
+        return self.add_entries(other_table.data, allow_duplicates=allow_duplicates, persist=persist, **kwd)
 
     def handle_found_index_file(self, filename):
         self.missing_index_file = None
@@ -478,14 +524,14 @@ class TabularToolDataTable(ToolDataTable):
         if "name" not in self.columns:
             self.columns["name"] = self.columns["value"]
 
-    def extend_data_with(self, filename: str, errors: Optional[List[str]] = None) -> None:
+    def extend_data_with(self, filename: str, errors: Optional[ErrorListT] = None) -> None:
         here = os.path.dirname(os.path.abspath(filename))
         self.data.extend(self.parse_file_fields(filename, errors=errors, here=here))
         if not self.allow_duplicate_entries:
             self._deduplicate_data()
 
     def parse_file_fields(
-        self, filename: str, errors: Optional[List[str]] = None, here: str = "__HERE__"
+        self, filename: str, errors: Optional[ErrorListT] = None, here: str = "__HERE__"
     ) -> List[List[str]]:
         """
         Parse separated lines from file and return a list of tuples.
@@ -569,17 +615,22 @@ class TabularToolDataTable(ToolDataTable):
         return rval
 
     # This method is used in tools, so need to keep its API stable
-    def get_filename_for_source(
-        self, source: Optional[Union[Dict, "DataManager"]], default: Optional[str] = None
-    ) -> Optional[str]:
+    def get_filename_for_source(self, source: EntrySource, default: Optional[str] = None) -> Optional[str]:
+        source_repo_info: Optional[dict] = None
         if source:
             # if dict, assume is compatible info dict, otherwise call method
+
             if isinstance(source, dict):
                 source_repo_info = source
             else:
-                source_repo_info = source.get_tool_shed_repository_info_dict()
-        else:
-            source_repo_info = None
+                source_repo_info_model: Optional[RepoInfo]
+                if source is None or isinstance(source, RepoInfo):
+                    source_repo_info_model = source
+                else:
+                    # we have a data manager, use its repo_info method
+                    source_data_manager = cast("DataManager", source)
+                    source_repo_info_model = source_data_manager.repo_info
+                source_repo_info = source_repo_info_model.dict() if source_repo_info_model else None
         filename = default
         for name, value in self.filenames.items():
             repo_info = value.get("tool_shed_repository")
@@ -595,7 +646,7 @@ class TabularToolDataTable(ToolDataTable):
         entry: Union[List[str], Dict[str, str]],
         allow_duplicates: bool = True,
         persist: bool = False,
-        entry_source=None,
+        entry_source: EntrySource = None,
         **kwd,
     ) -> None:
         # accepts dict or list of columns
@@ -802,6 +853,26 @@ def _expand_here_template(content: str, here: Optional[str]) -> str:
 tool_data_table_types_list: List[Type[ToolDataTable]] = [TabularToolDataTable]
 
 
+class HasExtraFiles(Protocol):
+    extra_files_path: str
+
+    def extra_files_path_exists(self) -> bool:
+        ...
+
+
+class DirectoryAsExtraFiles(HasExtraFiles):
+    def __init__(self, directory):
+        self.extra_files_path = directory
+
+    def extra_files_path_exists(self) -> bool:
+        return True
+
+
+class OutputDataset(HasExtraFiles):
+    ext: str
+    file_name: str
+
+
 class ToolDataTableManager(Dictifiable):
     """Manages a collection of tool data tables"""
 
@@ -813,7 +884,7 @@ class ToolDataTableManager(Dictifiable):
         tool_data_path: str,
         config_filename: Optional[Union[StrPath, List[StrPath]]] = None,
         tool_data_table_config_path_set=None,
-        other_config_dict: Optional[Union["GalaxyAppConfiguration", Dict[str, Any]]] = None,
+        other_config_dict: Optional[StoresConfigFilePaths] = None,
     ) -> None:
         self.tool_data_path = tool_data_path
         # This stores all defined data table entries from both the tool_data_table_conf.xml file and the shed_tool_data_table_conf.xml file
@@ -911,7 +982,7 @@ class ToolDataTableManager(Dictifiable):
         from_shed_config: bool,
         filename: StrPath,
         tool_data_path_files: ToolDataPathFiles,
-        other_config_dict: Optional[Union["GalaxyAppConfiguration", Dict[str, Any]]] = None,
+        other_config_dict: Optional[StoresConfigFilePaths] = None,
     ) -> ToolDataTable:
         table_type = table_elem.get("type", "tabular")
         assert table_type in self.tool_data_table_types, f"Unknown data table type '{table_type}'"
@@ -1045,3 +1116,291 @@ class ToolDataTableManager(Dictifiable):
             if path in data_table.filenames:
                 table_names.add(name)
         return list(table_names)
+
+    def process_bundle(
+        self,
+        out_data: Dict[str, OutputDataset],
+        bundle_description: DataTableBundleProcessorDescription,
+        repo_info: Optional[RepoInfo],
+        options: "BundleProcessingOptions",
+    ) -> List[str]:
+        data_manager_dict: Dict[str, Any] = _data_manager_dict(out_data)
+        bundle = DataTableBundle(
+            processor_description=bundle_description,
+            data_tables=data_manager_dict.get("data_tables", {}),
+            repo_info=repo_info,
+        )
+        return _process_bundle(out_data, bundle, options, self)
+
+    def import_bundle(
+        self,
+        target: str,
+        options: "BundleProcessingOptions",
+    ) -> List[str]:
+        if not os.path.isdir(target):
+            target_directory = decompress_path_to_directory(target)
+        else:
+            target_directory = target
+        index_json = os.path.join(target_directory, BUNDLE_INDEX_FILE_NAME)
+        with open(index_json) as f:
+            index = json.load(f)
+        bundle = DataTableBundle(**index)
+        assert bundle.output_name
+        out_data = {bundle.output_name: DirectoryAsExtraFiles(target_directory)}
+        return _process_bundle(out_data, bundle, options, self)
+
+    def write_bundle(
+        self,
+        out_data: Dict[str, OutputDataset],
+        bundle_description: DataTableBundleProcessorDescription,
+        repo_info: Optional[RepoInfo],
+    ) -> None:
+        data_manager_dict = _data_manager_dict(out_data, ensure_single_output=True)
+        for output_name, dataset in out_data.items():
+            if dataset.ext != "data_manager_json":
+                continue
+
+            bundle = DataTableBundle(
+                data_tables=data_manager_dict.get("data_tables", {}),
+                output_name=output_name,
+                processor_description=bundle_description,
+                repo_info=repo_info,
+            )
+            extra_files_path = dataset.extra_files_path
+            bundle_path = os.path.join(extra_files_path, BUNDLE_INDEX_FILE_NAME)
+            with open(bundle_path, "w") as fw:
+                json.dump(bundle.dict(), fw)
+
+
+SUPPORTED_DATA_TABLE_TYPES = TabularToolDataTable
+
+
+@dataclass
+class BundleProcessingOptions:
+    what: str
+    data_manager_path: str
+    target_config_file: str
+
+
+def _data_manager_dict(out_data: Dict[str, OutputDataset], ensure_single_output: bool = False) -> Dict[str, Any]:
+    data_manager_dict: Dict[str, Any] = {}
+    found_output = False
+
+    for output_name, output_dataset in out_data.items():
+        if output_dataset.ext != "data_manager_json":
+            continue
+        if found_output and ensure_single_output:
+            raise Exception("Galaxy can only write bundles for data managers with a single output data_manager_json.")
+        found_output = True
+
+        try:
+            output_dict = json.loads(open(output_dataset.file_name).read())
+        except Exception as e:
+            log.warning(f'Error reading DataManagerTool json for "{output_name}": {e}')
+            continue
+        for key, value in output_dict.items():
+            if key not in data_manager_dict:
+                data_manager_dict[key] = {}
+            data_manager_dict[key].update(value)
+        data_manager_dict.update(output_dict)
+    return data_manager_dict
+
+
+from typing import Mapping
+
+
+def _process_bundle(
+    out_data: Mapping[str, HasExtraFiles],
+    bundle: DataTableBundle,
+    options: BundleProcessingOptions,
+    tool_data_tables: ToolDataTableManager,
+):
+    updated_data_tables = []
+    data_tables_dict = bundle.data_tables
+    bundle_description = bundle.processor_description
+    for data_table_name in bundle_description.data_table_names:
+        data_table_values = data_tables_dict.pop(data_table_name, None)
+        if not data_table_values:
+            log.warning(f'No values for data table "{data_table_name}" were returned by "{options.what}".')
+            continue  # next data table
+        data_table_remove_values = None
+        if isinstance(data_table_values, dict):
+            values_to_add = data_table_values.get("add")
+            data_table_remove_values = data_table_values.get("remove")
+            if values_to_add or data_table_remove_values:
+                # We don't have an old style data table definition
+                data_table_values = values_to_add
+
+        data_table = tool_data_tables.get(data_table_name, None)
+        if data_table is None:
+            log.error(
+                f'Processing by {options.what} returned an unknown data table "{data_table_name}" with new entries "{data_table_values}". These entries will not be created. Please confirm that an entry for "{data_table_name}" exists in your "tool_data_table_conf.xml" file.'
+            )
+            continue  # next table name
+        if not isinstance(data_table, SUPPORTED_DATA_TABLE_TYPES):
+            log.error(
+                f'Processing by {options.what} returned an unsupported data table "{data_table_name}" with type "{type(data_table)}" with new entries "{data_table_values}". These entries will not be created. Please confirm that the data table is of a supported type ({SUPPORTED_DATA_TABLE_TYPES}).'
+            )
+            continue  # next table name
+        output_ref_values = {}
+        output_ref_by_data_table = bundle_description.output_ref_by_data_table
+        if data_table_name in output_ref_by_data_table:
+            for data_table_column, output_ref in output_ref_by_data_table[data_table_name].items():
+                output_ref_dataset = out_data.get(output_ref, None)
+                assert output_ref_dataset is not None, "Referenced output was not found."
+                output_ref_values[data_table_column] = output_ref_dataset
+
+        if not isinstance(data_table_values, list):
+            data_table_values = [data_table_values] if data_table_values else []
+        if not isinstance(data_table_remove_values, list):
+            data_table_remove_values = [data_table_remove_values] if data_table_remove_values else []
+        for data_table_row in data_table_values:
+            data_table_value = dict(**data_table_row)  # keep original values here
+            for (
+                name
+            ) in (
+                data_table_row.keys()
+            ):  # FIXME: need to loop through here based upon order listed in data_manager config
+                if name in output_ref_values:
+                    _process_move(
+                        data_table_name,
+                        name,
+                        output_ref_values[name].extra_files_path,
+                        bundle_description,
+                        options,
+                        **data_table_value,
+                    )
+                    data_table_value[name] = _process_value_translations(
+                        data_table_name, name, bundle_description, options, **data_table_value
+                    )
+            data_table.add_entry(data_table_value, persist=True, entry_source=bundle.repo_info)
+        # Removes data table entries
+        for data_table_row in data_table_remove_values:
+            data_table_value = dict(**data_table_row)  # keep original values here
+            data_table.remove_entry(list(data_table_value.values()))
+
+        updated_data_tables.append(data_table_name)
+    if bundle_description.undeclared_tables and data_tables_dict:
+        # We handle the data move, by just moving all the data out of the extra files path
+        # moving a directory and the target already exists, we move the contents instead
+        log.debug("Attempting to add entries for undeclared tables: %s.", ", ".join(data_tables_dict.keys()))
+        for ref_file in out_data.values():
+            if ref_file.extra_files_path_exists():
+                util.move_merge(ref_file.extra_files_path, options.data_manager_path)
+        path_column_names = ["path"]
+        for data_table_name, data_table_values in data_tables_dict.items():
+            data_table = tool_data_tables.get(data_table_name, None)
+            if not isinstance(data_table_values, list):
+                data_table_values = [data_table_values]
+            for data_table_row in data_table_values:
+                data_table_value = dict(**data_table_row)  # keep original values here
+                for name, value in data_table_row.items():
+                    if name in path_column_names:
+                        data_table_value[name] = os.path.abspath(os.path.join(options.data_manager_path, value))
+                data_table.add_entry(data_table_value, persist=True, entry_source=bundle.repo_info)
+            updated_data_tables.append(data_table_name)
+    else:
+        for data_table_name, data_table_values in data_tables_dict.items():
+            # tool returned extra data table entries, but data table was not declared in data manager
+            # do not add these values, but do provide messages
+            log.warning(
+                f'Processing by {options.what} returned an undeclared data table "{data_table_name}" with new entries "{data_table_values}". These entries will not be created. Please confirm that an entry for "{data_table_name}" exists in your "{options.target_config_file}" file.'
+            )
+    return updated_data_tables
+
+
+def _process_move(
+    data_table_name: str,
+    column_name: str,
+    source_base_path: str,
+    bundle_description: DataTableBundleProcessorDescription,
+    options: BundleProcessingOptions,
+    **kwd,
+):
+    move_by_data_table_column = bundle_description.move_by_data_table_column
+    if data_table_name in move_by_data_table_column and column_name in move_by_data_table_column[data_table_name]:
+        move = move_by_data_table_column[data_table_name][column_name]
+        source = move.source_base
+        if source is None:
+            source = source_base_path
+        else:
+            source = fill_template(
+                source,
+                GALAXY_DATA_MANAGER_DATA_PATH=options.data_manager_path,
+                **kwd,
+            ).strip()
+        assert source
+
+        if move.source_value:
+            source = os.path.join(
+                source,
+                fill_template(
+                    move.source_value,
+                    GALAXY_DATA_MANAGER_DATA_PATH=options.data_manager_path,
+                    **kwd,
+                ).strip(),
+            )
+
+        target = move.target_base
+        if target is None:
+            target = options.data_manager_path
+        else:
+            target = fill_template(
+                target,
+                GALAXY_DATA_MANAGER_DATA_PATH=options.data_manager_path,
+                **kwd,
+            ).strip()
+        assert target
+
+        if move.target_value:
+            target = os.path.join(
+                target,
+                fill_template(
+                    move.target_value,
+                    GALAXY_DATA_MANAGER_DATA_PATH=options.data_manager_path,
+                    **kwd,
+                ).strip(),
+            )
+
+        if move.type == "file":
+            dirs = os.path.split(target)[0]
+            try:
+                os.makedirs(dirs)
+            except OSError as e:
+                if e.errno != errno.EEXIST:
+                    raise e
+        # moving a directory and the target already exists, we move the contents instead
+        if os.path.exists(source):
+            util.move_merge(source, target)
+
+        if move.relativize_symlinks:
+            util.relativize_symlinks(target)
+
+        return True
+    return False
+
+
+def _process_value_translations(
+    data_table_name: str,
+    column_name: str,
+    bundle_description: DataTableBundleProcessorDescription,
+    options: BundleProcessingOptions,
+    **kwd,
+) -> str:
+    value_translation_by_data_table_column = bundle_description.value_translation_by_data_table_column
+    value = kwd.get(column_name)
+    if (
+        data_table_name in value_translation_by_data_table_column
+        and column_name in value_translation_by_data_table_column[data_table_name]
+    ):
+        for value_translation in value_translation_by_data_table_column[data_table_name][column_name]:
+            if isinstance(value_translation, str):
+                value = fill_template(
+                    value_translation,
+                    GALAXY_DATA_MANAGER_DATA_PATH=options.data_manager_path,
+                    **kwd,
+                ).strip()
+            else:
+                value = value_translation(value)
+    assert value
+    return value
diff --git a/lib/galaxy/tool_util/data/bundles/models.py b/lib/galaxy/tool_util/data/bundles/models.py
new file mode 100644
index 00000000000..c675bd08531
--- /dev/null
+++ b/lib/galaxy/tool_util/data/bundles/models.py
@@ -0,0 +1,270 @@
+import os
+from typing import (
+    Callable,
+    Dict,
+    Iterator,
+    List,
+    Optional,
+    Tuple,
+    Union,
+)
+
+from pydantic import (
+    BaseModel,
+    Extra,
+    root_validator,
+)
+
+from galaxy.util import (
+    asbool,
+    Element,
+)
+
+ALLOW_EXTRA = Extra.forbid
+
+
+DEFAULT_VALUE_TRANSLATION_TYPE = "template"
+VALUE_TRANSLATION_FUNCTIONS: Dict[str, Callable] = dict(abspath=os.path.abspath)
+DEFAULT_VALUE_TRANSLATION_TYPE = "template"
+
+
+class DataTableBundleProcessorDataTableOutputColumnTranslation(BaseModel):
+    type: str
+    value: str
+
+    class Config:
+        extra = ALLOW_EXTRA
+
+
+class DataTableBundleProcessorDataTableOutputColumnMove(BaseModel):
+    type: str
+    source_base: Optional[str] = None
+    source_value: str = ""
+    target_base: Optional[str] = None
+    target_value: Optional[str] = None
+    relativize_symlinks: bool
+
+    class Config:
+        extra = ALLOW_EXTRA
+
+
+class DataTableBundleProcessorDataTableOutputColumn(BaseModel):
+    name: str
+    data_table_name: str
+    output_ref: Optional[str] = None
+    value_translations: List[DataTableBundleProcessorDataTableOutputColumnTranslation] = []
+    moves: List[DataTableBundleProcessorDataTableOutputColumnMove] = []
+
+    class Config:
+        extra = ALLOW_EXTRA
+
+    @root_validator(pre=True)
+    def fill_in_default_data_table_name(cls, values):
+        data_table_name = values.get("data_table_name")
+        if data_table_name is None:
+            values["data_table_name"] = values["name"]
+        return values
+
+
+class DataTableBundleProcessorDataTableOutput(BaseModel):
+    columns: List[DataTableBundleProcessorDataTableOutputColumn]
+
+    class Config:
+        extra = ALLOW_EXTRA
+
+
+class DataTableBundleProcessorDataTable(BaseModel):
+    name: str
+    output: Optional[DataTableBundleProcessorDataTableOutput]
+
+    class Config:
+        extra = ALLOW_EXTRA
+
+
+class DataTableBundleProcessorDescription(BaseModel):
+    undeclared_tables: bool = False
+    data_tables: List[DataTableBundleProcessorDataTable]
+
+    class Config:
+        extra = ALLOW_EXTRA
+
+    @property
+    def data_table_names(self) -> List[str]:
+        names = []
+        for data_table in self.data_tables:
+            data_table_name = data_table.name
+            names.append(data_table_name)
+        return names
+
+    def _walk_columns(self) -> Iterator[Tuple[str, DataTableBundleProcessorDataTableOutputColumn]]:
+        for data_table in self.data_tables:
+            data_table_name = data_table.name
+            output = data_table.output
+            if output:
+                for column in output.columns:
+                    yield (data_table_name, column)
+
+    @property
+    def output_ref_by_data_table(self) -> Dict[str, Dict[str, str]]:
+        output_refs: Dict[str, Dict[str, str]] = {}
+        for data_table_name, column in self._walk_columns():
+            data_table_column_name = column.data_table_name
+            output_ref = column.output_ref
+            if output_ref is not None:
+                if data_table_name not in output_refs:
+                    output_refs[data_table_name] = {}
+                output_refs[data_table_name][data_table_column_name] = output_ref
+        return output_refs
+
+    @property
+    def move_by_data_table_column(self) -> Dict[str, Dict[str, DataTableBundleProcessorDataTableOutputColumnMove]]:
+        by_column: Dict[str, Dict[str, DataTableBundleProcessorDataTableOutputColumnMove]] = {}
+        for data_table_name, column in self._walk_columns():
+            data_table_column_name = column.data_table_name
+            for move in column.moves:
+                if data_table_name not in by_column:
+                    by_column[data_table_name] = {}
+                by_column[data_table_name][data_table_column_name] = move
+
+        return by_column
+
+    @property
+    def value_translation_by_data_table_column(self) -> Dict[str, Dict[str, List[Union[str, Callable]]]]:
+        by_column: Dict[str, Dict[str, List[Union[str, Callable]]]] = {}
+        for data_table_name, column in self._walk_columns():
+            data_table_column_name = column.data_table_name
+            for value_translation_model in column.value_translations:
+                value_translation_str = value_translation_model.value
+                value_translation_type = value_translation_model.type
+                if data_table_name not in by_column:
+                    by_column[data_table_name] = {}
+                if data_table_column_name not in by_column[data_table_name]:
+                    by_column[data_table_name][data_table_column_name] = []
+                value_translation: Union[str, Callable]
+                if value_translation_type == "function":
+                    if value_translation_str in VALUE_TRANSLATION_FUNCTIONS:
+                        value_translation = VALUE_TRANSLATION_FUNCTIONS[value_translation_str]
+                    else:
+                        raise ValueError(f"Unsupported value translation function: '{value_translation}'")
+                else:
+                    assert value_translation_type == DEFAULT_VALUE_TRANSLATION_TYPE, ValueError(
+                        f"Unsupported value translation type: '{value_translation_type}'"
+                    )
+                    value_translation = value_translation_str
+                by_column[data_table_name][data_table_column_name].append(value_translation)
+        return by_column
+
+
+class RepoInfo(BaseModel):
+    tool_shed: str
+    name: str
+    owner: str
+    installed_changeset_revision: str
+
+    class Config:
+        # we use dictionary equality (yuk) so definitely make sure this is okay.
+        extra = Extra.forbid
+
+
+class DataTableBundle(BaseModel):
+    processor_description: DataTableBundleProcessorDescription
+    data_tables: dict
+    output_name: Optional[str] = None
+    repo_info: Optional[RepoInfo] = None
+
+
+def _xml_to_data_table_output_column_move(move_elem: Element) -> DataTableBundleProcessorDataTableOutputColumnMove:
+    move_type = move_elem.get("type", "directory")
+    relativize_symlinks = move_elem.get(
+        "relativize_symlinks", False
+    )  # TODO: should we instead always relativize links?
+    source_elem = move_elem.find("source")
+    if source_elem is None:
+        source_base = None
+        source_value = ""
+    else:
+        source_base = source_elem.get("base", None)
+        source_value = source_elem.text
+    target_elem = move_elem.find("target")
+    if target_elem is None:
+        target_base = None
+        target_value = ""
+    else:
+        target_base = target_elem.get("base", None)
+        target_value = target_elem.text
+    return DataTableBundleProcessorDataTableOutputColumnMove(
+        type=move_type,
+        source_base=source_base,
+        source_value=source_value,
+        target_base=target_base,
+        target_value=target_value,
+        relativize_symlinks=relativize_symlinks,
+    )
+
+
+def _xml_to_data_table_output_column_translation(
+    value_translation_elem: Element,
+) -> Optional[DataTableBundleProcessorDataTableOutputColumnTranslation]:
+    value_translation = value_translation_elem.text
+    if value_translation is not None:
+        value_translation_type = value_translation_elem.get("type", DEFAULT_VALUE_TRANSLATION_TYPE)
+        return DataTableBundleProcessorDataTableOutputColumnTranslation(
+            value=value_translation, type=value_translation_type
+        )
+    else:
+        return None
+
+
+def _xml_to_data_table_output_column(column_elem: Element) -> DataTableBundleProcessorDataTableOutputColumn:
+    column_name = column_elem.get("name", None)
+    assert column_name is not None, "Name is required for column entry"
+    data_table_column_name = column_elem.get("data_table_name", column_name)
+    output_ref = column_elem.get("output_ref", None)
+    value_translation_elems = column_elem.findall("value_translation")
+    value_translations = []
+    if value_translation_elems is not None:
+        for value_translation_elem in value_translation_elems:
+            value_translation = _xml_to_data_table_output_column_translation(value_translation_elem)
+            if value_translation is None:
+                continue
+            value_translations.append(value_translation)
+
+    moves = []
+    for move_elem in column_elem.findall("move"):
+        moves.append(_xml_to_data_table_output_column_move(move_elem))
+
+    return DataTableBundleProcessorDataTableOutputColumn(
+        name=column_name,
+        data_table_name=data_table_column_name,
+        output_ref=output_ref,
+        value_translations=value_translations,
+        moves=moves,
+    )
+
+
+def _xml_to_data_table_output(output_elem: Optional[Element]) -> Optional[DataTableBundleProcessorDataTableOutput]:
+    if output_elem is not None:
+        columns = []
+        for column_elem in output_elem.findall("column"):
+            columns.append(_xml_to_data_table_output_column(column_elem))
+        return DataTableBundleProcessorDataTableOutput(columns=columns)
+    else:
+        return None
+
+
+def _xml_to_data_table(data_table_elem: Element) -> DataTableBundleProcessorDataTable:
+    data_table_name = data_table_elem.get("name")
+    assert data_table_name is not None, "A name is required for a data table entry"
+
+    output_elem = data_table_elem.find("output")
+    output = _xml_to_data_table_output(output_elem)
+    return DataTableBundleProcessorDataTable(name=data_table_name, output=output)
+
+
+def convert_data_tables_xml(elem: Element) -> DataTableBundleProcessorDescription:
+    undeclared_tables = asbool(elem.get("undeclared_tables", False))
+    data_tables = []
+    for data_table_elem in elem.findall("data_table"):
+        data_tables.append(_xml_to_data_table(data_table_elem))
+
+    return DataTableBundleProcessorDescription(undeclared_tables=undeclared_tables, data_tables=data_tables)
diff --git a/lib/galaxy/tool_util/deps/brew_exts.py b/lib/galaxy/tool_util/deps/brew_exts.py
index 5c0acc66074..e00e4a7faa0 100755
--- a/lib/galaxy/tool_util/deps/brew_exts.py
+++ b/lib/galaxy/tool_util/deps/brew_exts.py
@@ -29,6 +29,10 @@ import re
 import string
 import subprocess
 import sys
+from typing import (
+    List,
+    Tuple,
+)
 
 WHITESPACE_PATTERN = re.compile(r"[\s]+")
 
@@ -76,7 +80,7 @@ class RecipeContext:
         return recipe_cellar_path(self.brew_context.homebrew_cellar, self.recipe, self.version)
 
     @property
-    def tap_path(self):
+    def tap_path(self) -> str:
         return os.path.join(self.brew_context.homebrew_prefix, "Library", "Taps", self.__tap_path(self.recipe))
 
     def __tap_path(self, recipe):
@@ -234,7 +238,7 @@ def versioned_install(recipe_context, package=None, version=None, installed_deps
             attempt_unlink_all(package, deps)
 
 
-def commit_for_version(recipe_context, package, version):
+def commit_for_version(recipe_context: RecipeContext, package, version):
     tap_path = recipe_context.tap_path
     commit = None
     with brew_head_at_commit("master", tap_path):
@@ -490,8 +494,8 @@ def extended_brew_info(recipe):
     return extra_info
 
 
-def brew_versions_info(package, tap_path):
-    def versioned(recipe_path):
+def brew_versions_info(package, tap_path: str) -> List[Tuple[str, str, bool]]:
+    def versioned(recipe_path: str):
         if not os.path.isabs(recipe_path):
             recipe_path = os.path.join(os.getcwd(), recipe_path)
         # Dependencies in the same repository should be versioned,
@@ -502,7 +506,7 @@ def brew_versions_info(package, tap_path):
     # TODO: Also use tags.
     stdout = brew_execute(["versions", package])
     version_parts = [line for line in stdout.split("\n") if line and "git checkout" in line]
-    version_parts = map(lambda l: WHITESPACE_PATTERN.split(l), version_parts)
+    version_parts = [WHITESPACE_PATTERN.split(line) for line in version_parts]
     info = [(p[0], p[3], versioned(p[4])) for p in version_parts]
     return info
 
diff --git a/lib/galaxy/tool_util/deps/brew_util.py b/lib/galaxy/tool_util/deps/brew_util.py
index d513a23461f..a2e19d7d5cc 100644
--- a/lib/galaxy/tool_util/deps/brew_util.py
+++ b/lib/galaxy/tool_util/deps/brew_util.py
@@ -2,7 +2,7 @@
 builds on those abstraction and provides Galaxy specific functionality
 not useful to the brew external commands.
 """
-from ..deps import brew_exts
+from . import brew_exts
 
 DEFAULT_TAP = "homebrew/science"
 
diff --git a/lib/galaxy/tool_util/deps/container_resolvers/explicit.py b/lib/galaxy/tool_util/deps/container_resolvers/explicit.py
index db6569d19b1..a15bc5d5039 100644
--- a/lib/galaxy/tool_util/deps/container_resolvers/explicit.py
+++ b/lib/galaxy/tool_util/deps/container_resolvers/explicit.py
@@ -4,9 +4,9 @@ import os
 from typing import cast
 
 from galaxy.util.commands import shell
+from . import ContainerResolver
 from .mulled import CliContainerResolver
 from ..container_classes import SingularityContainer
-from ..container_resolvers import ContainerResolver
 from ..requirements import ContainerDescription
 
 log = logging.getLogger(__name__)
diff --git a/lib/galaxy/tool_util/deps/installable.py b/lib/galaxy/tool_util/deps/installable.py
index 684ab058568..3488f4a0a14 100644
--- a/lib/galaxy/tool_util/deps/installable.py
+++ b/lib/galaxy/tool_util/deps/installable.py
@@ -1,12 +1,8 @@
 """Abstractions for installing local software managed and required by Galaxy/galaxy-lib."""
 
+import abc
 import logging
 import os
-from abc import (
-    ABCMeta,
-    abstractmethod,
-    abstractproperty,
-)
 
 from galaxy.util.filelock import (
     FileLock,
@@ -16,22 +12,24 @@ from galaxy.util.filelock import (
 log = logging.getLogger(__name__)
 
 
-class InstallableContext(metaclass=ABCMeta):
+class InstallableContext(metaclass=abc.ABCMeta):
     """Represent a directory/configuration of something that can be installed."""
 
-    @abstractmethod
+    @abc.abstractmethod
     def is_installed(self):
         """Return bool indicating if the configured software is installed."""
 
-    @abstractmethod
+    @abc.abstractmethod
     def can_install(self):
         """Check preconditions for installation."""
 
-    @abstractproperty
+    @property
+    @abc.abstractmethod
     def installable_description(self):
         """Short description of thing being installed for log statements."""
 
-    @abstractproperty
+    @property
+    @abc.abstractmethod
     def parent_path(self):
         """Return parent path of the location the installable will be created within."""
 
diff --git a/lib/galaxy/tool_util/deps/mulled/get_tests.py b/lib/galaxy/tool_util/deps/mulled/get_tests.py
index 895995264a7..e7ac94e9f90 100644
--- a/lib/galaxy/tool_util/deps/mulled/get_tests.py
+++ b/lib/galaxy/tool_util/deps/mulled/get_tests.py
@@ -20,6 +20,7 @@ except ImportError:
     Template = None  # type: ignore[assignment,misc]
     UndefinedError = Exception  # type: ignore[assignment,misc]
 
+from galaxy.util import check_github_api_response_rate_limit
 from .util import (
     get_file_from_recipe_url,
     MULLED_SOCKET_TIMEOUT,
@@ -142,6 +143,7 @@ def find_anaconda_versions(name, anaconda_channel="bioconda"):
     Find a list of available anaconda versions for a given container name
     """
     r = requests.get(f"https://anaconda.org/{anaconda_channel}/{name}/files", timeout=MULLED_SOCKET_TIMEOUT)
+    r.raise_for_status()
     urls = []
     for line in r.text.split("\n"):
         if "download/linux" in line:
@@ -173,12 +175,10 @@ def get_alternative_versions(filepath, filename, recipes_path=None, github_repo=
         return [n.replace(f"{recipes_path}/", "") for n in glob(f"{recipes_path}/{filepath}/*/{filename}")]
     # else use the GitHub API:
     versions = []
-    r = json.loads(
-        requests.get(
-            f"https://api.github.com/repos/{github_repo}/contents/{filepath}", timeout=MULLED_SOCKET_TIMEOUT
-        ).text
-    )
-    for subfile in r:
+    r = requests.get(f"https://api.github.com/repos/{github_repo}/contents/{filepath}", timeout=MULLED_SOCKET_TIMEOUT)
+    check_github_api_response_rate_limit(r)
+    r.raise_for_status()
+    for subfile in json.loads(r.text):
         if subfile["type"] == "dir":
             if (
                 requests.get(
@@ -295,6 +295,7 @@ def hashed_test_search(
     containers = []
     for package in packages:
         r = requests.get(f"https://anaconda.org/bioconda/{package[0]}/files", timeout=MULLED_SOCKET_TIMEOUT)
+        r.raise_for_status()
         p = "-".join(package)
         for line in r.text.split("\n"):
             if p in line:
diff --git a/lib/galaxy/tool_util/deps/mulled/invfile.lua b/lib/galaxy/tool_util/deps/mulled/invfile.lua
index 1f3e0389862..38ddc860cc3 100644
--- a/lib/galaxy/tool_util/deps/mulled/invfile.lua
+++ b/lib/galaxy/tool_util/deps/mulled/invfile.lua
@@ -42,13 +42,14 @@ end
 
 local conda_image = VAR.CONDA_IMAGE
 if conda_image == '' then
-    conda_image = 'continuumio/miniconda3:latest'
+    conda_image = 'quay.io/condaforge/mambaforge:latest'
 end
 
+local conda_bin = VAR.CONDA_BIN
 
 local singularity_image = VAR.SINGULARITY_IMAGE
 if singularity_image == '' then
-    singularity_image = 'quay.io/biocontainers/singularity:2.4.6--0'
+    singularity_image = 'quay.io/singularity/singularity:v3.10.4'
 end
 
 local singularity_image_dir = VAR.SINGULARITY_IMAGE_DIR
@@ -87,7 +88,7 @@ inv.task('build')
     .using(conda_image)
         .withHostConfig({binds = bind_args})
         .run('/bin/sh', '-c', preinstall
-            .. 'conda install '
+            .. conda_bin .. ' install '
             .. channel_args .. ' '
             .. target_args
             .. ' --strict-channel-priority -p /usr/local --copy --yes '
diff --git a/lib/galaxy/tool_util/deps/mulled/mulled_build.py b/lib/galaxy/tool_util/deps/mulled/mulled_build.py
index beb8b693f1f..7f99a829b3f 100644
--- a/lib/galaxy/tool_util/deps/mulled/mulled_build.py
+++ b/lib/galaxy/tool_util/deps/mulled/mulled_build.py
@@ -197,6 +197,8 @@ def mull_targets(
     repository_template=DEFAULT_REPOSITORY_TEMPLATE,
     dry_run=False,
     conda_version=None,
+    mamba_version=None,
+    use_mamba=False,
     verbose=False,
     binds=DEFAULT_BINDS,
     rebuild=True,
@@ -284,9 +286,28 @@ def mull_targets(
         involucro_args.extend(["-set", f"USER_ID={os.getuid()}:{os.getgid()}"])
     if test:
         involucro_args.extend(["-set", f"TEST={test}"])
-    if conda_version is not None:
-        verbose = "--verbose" if verbose else "--quiet"
-        involucro_args.extend(["-set", f"PREINSTALL=conda install {verbose} --yes conda={conda_version}"])
+
+    verbose = "--verbose" if verbose else "--quiet"
+    conda_bin = "conda"
+    if use_mamba:
+        conda_bin = "mamba"
+        if mamba_version is None:
+            mamba_version = ""
+    involucro_args.extend(["-set", "CONDA_BIN=%s" % conda_bin])
+    if conda_version is not None or mamba_version is not None:
+        mamba_test = "true"
+        specs = []
+        if conda_version is not None:
+            specs.append(f"conda={conda_version}")
+        if mamba_version is not None:
+            specs.append(f"mamba={mamba_version}")
+            if mamba_version == "" and not specs:
+                # If nothing but mamba without a specific version is requested,
+                # then only run conda install if mamba is not already installed.
+                mamba_test = "[ '[]' = \"$( conda list --json --full-name mamba )\" ]"
+        conda_install = f"""conda install {verbose} --yes {" ".join(f"'{spec}'" for spec in specs)}"""
+        involucro_args.extend(["-set", f"PREINSTALL=if {mamba_test} ; then {conda_install} ; fi"])
+
     involucro_args.append(command)
     if test_files:
         test_bind = []
@@ -456,6 +477,18 @@ def add_build_arguments(parser):
         default=None,
         help="Change to specified version of Conda before installing packages.",
     )
+    parser.add_argument(
+        "--mamba-version",
+        dest="mamba_version",
+        default=None,
+        help="Change to specified version of Mamba before installing packages.",
+    )
+    parser.add_argument(
+        "--use-mamba",
+        dest="use_mamba",
+        action="store_true",
+        help="Use Mamba instead of Conda for package installation.",
+    )
     parser.add_argument(
         "--oauth-token",
         dest="oauth_token",
@@ -521,6 +554,10 @@ def args_to_mull_targets_kwds(args):
         kwds["repository_template"] = args.repository_template
     if hasattr(args, "conda_version"):
         kwds["conda_version"] = args.conda_version
+    if hasattr(args, "mamba_version"):
+        kwds["mamba_version"] = args.mamba_version
+    if hasattr(args, "use_mamba"):
+        kwds["use_mamba"] = args.use_mamba
     if hasattr(args, "oauth_token"):
         kwds["oauth_token"] = args.oauth_token
     if hasattr(args, "rebuild"):
diff --git a/lib/galaxy/tool_util/deps/mulled/mulled_search.py b/lib/galaxy/tool_util/deps/mulled/mulled_search.py
index 20700fbf29e..7555a36456a 100755
--- a/lib/galaxy/tool_util/deps/mulled/mulled_search.py
+++ b/lib/galaxy/tool_util/deps/mulled/mulled_search.py
@@ -5,15 +5,14 @@ import json
 import logging
 import sys
 import tempfile
-from datetime import (
-    datetime,
-    timezone,
-)
 
 import requests
 
 from galaxy.tool_util.deps.conda_util import CondaContext
-from galaxy.util import which
+from galaxy.util import (
+    check_github_api_response_rate_limit,
+    which,
+)
 from .mulled_list import get_singularity_containers
 from .util import (
     build_target,
@@ -147,17 +146,6 @@ class GitHubSearch:
     Tool to search the GitHub bioconda-recipes repo
     """
 
-    @staticmethod
-    def _check_response_rate_limit(response):
-        if response.status_code == 403 and "API rate limit exceeded" in response.json()["message"]:
-            # It can take tens of minutes before the rate limit window resets
-            message = "GitHub API rate limit exceeded."
-            rate_limit_reset_UTC_timestamp = response.headers.get("X-RateLimit-Reset")
-            if rate_limit_reset_UTC_timestamp:
-                rate_limit_reset_datetime = datetime.fromtimestamp(int(rate_limit_reset_UTC_timestamp), tz=timezone.utc)
-                message += f" The rate limit window will reset at {rate_limit_reset_datetime.isoformat()}."
-            raise Exception(message)
-
     def get_json(self, search_string):
         """
         Takes search_string variable and return results from the bioconda-recipes github repository in JSON format
@@ -169,7 +157,7 @@ class GitHubSearch:
             f"https://api.github.com/search/code?q={search_string}+in:path+repo:bioconda/bioconda-recipes+path:recipes",
             timeout=MULLED_SOCKET_TIMEOUT,
         )
-        self._check_response_rate_limit(response)
+        check_github_api_response_rate_limit(response)
         response.raise_for_status()
         return response.json()
 
@@ -188,7 +176,7 @@ class GitHubSearch:
             f"https://api.github.com/repos/bioconda/bioconda-recipes/contents/recipes/{search_string}",
             timeout=MULLED_SOCKET_TIMEOUT,
         )
-        self._check_response_rate_limit(response)
+        check_github_api_response_rate_limit(response)
         return response.status_code == 200
 
 
diff --git a/lib/galaxy/tool_util/deps/requirements.py b/lib/galaxy/tool_util/deps/requirements.py
index 7f59be7fa47..e787dc4e403 100644
--- a/lib/galaxy/tool_util/deps/requirements.py
+++ b/lib/galaxy/tool_util/deps/requirements.py
@@ -233,6 +233,11 @@ ResourceType = Literal[
     "ram_max",
     "tmpdir_min",
     "tmpdir_max",
+    "cuda_version_min",
+    "cuda_compute_capability",
+    "gpu_memory_min",
+    "cuda_device_count_min",
+    "cuda_device_count_max",
 ]
 VALID_RESOURCE_TYPES = get_args(ResourceType)
 
@@ -272,6 +277,11 @@ def resource_requirements_from_list(requirements) -> List[ResourceRequirement]:
         "ramMax": "ram_max",
         "tmpdirMin": "tmpdir_min",
         "tmpdirMax": "tmpdir_max",
+        "cudaVersionMin": "cuda_version_min",
+        "cudaComputeCapability": "cuda_compute_capability",
+        "gpuMemoryMin": "gpu_memory_min",
+        "cudaDeviceCountMin": "cuda_device_count_min",
+        "cudaDeviceCountMax": "cuda_device_count_max",
     }
     rr = []
     for r in requirements:
diff --git a/lib/galaxy/tool_util/lint.py b/lib/galaxy/tool_util/lint.py
index b6aad2a839e..c8852d5eb9c 100644
--- a/lib/galaxy/tool_util/lint.py
+++ b/lib/galaxy/tool_util/lint.py
@@ -323,7 +323,7 @@ def lint_tool_source_with(lint_context, tool_source, extra_modules=None) -> Lint
     linter_modules = submodules.import_submodules(galaxy.tool_util.linters)
     linter_modules.extend(extra_modules)
     for module in linter_modules:
-        lint_tool_types = getattr(module, "lint_tool_types", ["default"])
+        lint_tool_types = getattr(module, "lint_tool_types", ["default", "manage_data"])
         if not ("*" in lint_tool_types or tool_type in lint_tool_types):
             continue
 
diff --git a/lib/galaxy/tool_util/linters/_util.py b/lib/galaxy/tool_util/linters/_util.py
index 1e12c82faa1..025926259ae 100644
--- a/lib/galaxy/tool_util/linters/_util.py
+++ b/lib/galaxy/tool_util/linters/_util.py
@@ -8,4 +8,4 @@ def is_datasource(tool_xml):
 
 def is_valid_cheetah_placeholder(name):
     """Returns true if name is a valid Cheetah placeholder"""
-    return not re.match(r"^[a-zA-Z_]\w*$", name) is None
+    return re.match(r"^[a-zA-Z_]\w*$", name) is not None
diff --git a/lib/galaxy/tool_util/linters/inputs.py b/lib/galaxy/tool_util/linters/inputs.py
index e86372e2bdd..53cf2db0613 100644
--- a/lib/galaxy/tool_util/linters/inputs.py
+++ b/lib/galaxy/tool_util/linters/inputs.py
@@ -475,7 +475,7 @@ def lint_inputs(tool_xml, lint_ctx):
 
     # check if there is an output with the same name as an input
     outputs = tool_xml.find("./outputs")
-    if outputs:
+    if outputs is not None:
         for output in outputs:
             if output.get("name") in input_names:
                 lint_ctx.error(
diff --git a/lib/galaxy/tool_util/linters/outputs.py b/lib/galaxy/tool_util/linters/outputs.py
index 7d244d7a690..8232cbab891 100644
--- a/lib/galaxy/tool_util/linters/outputs.py
+++ b/lib/galaxy/tool_util/linters/outputs.py
@@ -98,7 +98,7 @@ def __check_format(node, lint_ctx, allow_ext=False):
     if fmt is None:
         fmt = node.attrib.get("format")
     if fmt == "input":
-        lint_ctx.warn(
+        lint_ctx.error(
             f"Using format='input' on {node.tag}, format_source attribute is less ambiguous and should be used instead.",
             node=node,
         )
diff --git a/lib/galaxy/tool_util/linters/tests.py b/lib/galaxy/tool_util/linters/tests.py
index 68767a92c97..f23c9231153 100644
--- a/lib/galaxy/tool_util/linters/tests.py
+++ b/lib/galaxy/tool_util/linters/tests.py
@@ -10,6 +10,22 @@ from ._util import is_datasource
 from ..verify import asserts
 
 
+def check_compare_attribs(element, lint_ctx, test_idx):
+    COMPARE_COMPATIBILITY = {
+        "sort": ["diff", "re_match", "re_match_multiline"],
+        "lines_diff": ["diff", "re_match", "contains"],
+        "decompress": ["diff"],
+        "delta": ["sim_size"],
+        "delta_frac": ["sim_size"],
+    }
+    compare = element.get("compare", "diff")
+    for attrib in COMPARE_COMPATIBILITY:
+        if attrib in element.attrib and compare not in COMPARE_COMPATIBILITY[attrib]:
+            lint_ctx.error(
+                f'Test {test_idx}: Attribute {attrib} is incompatible with compare="{compare}".', node=element
+            )
+
+
 def lint_tests(tool_xml, lint_ctx):
     # determine node to report for general problems with tests
     tests = tool_xml.findall("./tests/test")
@@ -38,11 +54,16 @@ def lint_tests(tool_xml, lint_ctx):
             if len(assertions) == 0:
                 continue
             if len(assertions) > 1:
-                lint_ctx.error(f"Test {test_idx}: More than one {ta} found. Only the first is considered.")
+                lint_ctx.error(f"Test {test_idx}: More than one {ta} found. Only the first is considered.", node=test)
             has_test = True
             _check_asserts(test_idx, assertions, lint_ctx)
         _check_asserts(test_idx, test.findall(".//assert_contents"), lint_ctx)
 
+        # check if expect_num_outputs is set if there are outputs with filters
+        filter = tool_xml.findall("./outputs//filter")
+        if len(filter) > 0 and "expect_num_outputs" not in test.attrib:
+            lint_ctx.warn("Test should specify 'expect_num_outputs' if outputs have filters", node=test)
+
         # really simple test that test parameters are also present in the inputs
         for param in test.findall("param"):
             name = param.attrib.get("name", None)
@@ -78,6 +99,13 @@ def lint_tests(tool_xml, lint_ctx):
                 )
                 continue
 
+            if output.tag == "output":
+                check_compare_attribs(output, lint_ctx, test_idx)
+            elements = output.findall("./element")
+            if elements:
+                for element in elements:
+                    check_compare_attribs(element, lint_ctx, test_idx)
+
             # check that
             # - test/output corresponds to outputs/data and
             # - test/collection to outputs/output_collection
@@ -103,7 +131,6 @@ def lint_tests(tool_xml, lint_ctx):
                             node=output,
                         )
                 else:
-                    elements = output.findall("./element")
                     if "count" not in output.attrib and len(elements) == 0:
                         lint_ctx.error(
                             f"Test {test_idx}: test collection '{name}' must have a 'count' attribute or 'element' children",
@@ -187,7 +214,7 @@ def _check_asserts(test_idx, assertions, lint_ctx):
                     lint_ctx.error(f"Test {test_idx}: '{a.tag}' needs to specify 'n', 'min', or 'max'", node=a)
             if a.tag == "has_size":
                 if "value" not in a.attrib and "min" not in a.attrib and "max" not in a.attrib:
-                    lint_ctx.error(f"Test {test_idx}: '{a.tag}' needs to specify 'n', 'min', or 'max'", node=a)
+                    lint_ctx.error(f"Test {test_idx}: '{a.tag}' needs to specify 'value', 'min', or 'max'", node=a)
 
 
 def _handle_optionals(annotation):
diff --git a/lib/galaxy/tool_util/locations/__init__.py b/lib/galaxy/tool_util/locations/__init__.py
index b9fe699de50..4f4706401b5 100644
--- a/lib/galaxy/tool_util/locations/__init__.py
+++ b/lib/galaxy/tool_util/locations/__init__.py
@@ -1,19 +1,16 @@
+import abc
 import tempfile
-from abc import (
-    ABCMeta,
-    abstractmethod,
-    abstractproperty,
-)
 
 
-class ToolLocationResolver(metaclass=ABCMeta):
+class ToolLocationResolver(metaclass=abc.ABCMeta):
     """Parse a URI-like string and return a ToolSource object."""
 
-    @abstractproperty
+    @property
+    @abc.abstractmethod
     def scheme(self):
         """Short label for the type of location resolver and URI scheme."""
 
-    @abstractmethod
+    @abc.abstractmethod
     def get_tool_source_path(self, uri_like: str) -> str:
         """Return a local path for the uri_like string."""
 
diff --git a/lib/galaxy/tool_util/locations/dockstore.py b/lib/galaxy/tool_util/locations/dockstore.py
index 3ef9c929889..68526b5ce6f 100644
--- a/lib/galaxy/tool_util/locations/dockstore.py
+++ b/lib/galaxy/tool_util/locations/dockstore.py
@@ -4,7 +4,7 @@ import requests
 import yaml
 
 from galaxy.util import DEFAULT_SOCKET_TIMEOUT
-from ..locations import ToolLocationResolver
+from . import ToolLocationResolver
 
 
 class DockStoreResolver(ToolLocationResolver):
diff --git a/lib/galaxy/tool_util/locations/file.py b/lib/galaxy/tool_util/locations/file.py
index cdc09981f17..daa09b56609 100644
--- a/lib/galaxy/tool_util/locations/file.py
+++ b/lib/galaxy/tool_util/locations/file.py
@@ -1,4 +1,4 @@
-from ..locations import ToolLocationResolver
+from . import ToolLocationResolver
 
 
 class HttpToolResolver(ToolLocationResolver):
diff --git a/lib/galaxy/tool_util/locations/http.py b/lib/galaxy/tool_util/locations/http.py
index e8fb7372cb0..3b13abf82c6 100644
--- a/lib/galaxy/tool_util/locations/http.py
+++ b/lib/galaxy/tool_util/locations/http.py
@@ -1,5 +1,5 @@
 from galaxy.util import download_to_file
-from ..locations import ToolLocationResolver
+from . import ToolLocationResolver
 
 
 class HttpToolResolver(ToolLocationResolver):
diff --git a/lib/galaxy/tool_util/ontologies/biotools_mappings.tsv b/lib/galaxy/tool_util/ontologies/biotools_mappings.tsv
index 9a427fdd0c1..bb23dd9fc7c 100644
--- a/lib/galaxy/tool_util/ontologies/biotools_mappings.tsv
+++ b/lib/galaxy/tool_util/ontologies/biotools_mappings.tsv
@@ -1,5 +1,1929 @@
 # tool-id <tab> bio.tools-id
 abyss-pe	abyss
 allegro	allegro
+datasets_download_genome	ncbi_resources
+ncbi_acc_download	ncbi_resources
+uniprotxml_downloader	uniprot
+unipept	unipept
+iedb_api	iedb
+sam_dump	sra
+sra_pileup	sra
+ncbi_eutils_esearch	ncbi_resources
+ncbi_eutils_egquery	ncbi_resources
+ncbi_eutils_ecitmatch	ncbi_resources
+ncbi_eutils_epost	ncbi_resources
+ncbi_eutils_elink	ncbi_resources
+ncbi_eutils_einfo	ncbi_resources
+ncbi_eutils_esummary	ncbi_resources
+ncbi_eutils_efetch	ncbi_resources
+uniprot	uniprot
+get_sequences	ensembl
+get_genetree	ensembl
+get_feature_info	ensembl
+enasearch_search_data	ena
+enasearch_retrieve_data	ena
+enasearch_retrieve_taxons	ena
+enasearch_retrieve_analysis_report	ena
+enasearch_retrieve_run_report	ena
+ebi_search_rest_results	ebi_search
+ebi_metagenomics_run_downloader	ebi_tools
+pyega3	ega
+ena_upload	ena
+gops_basecoverage_1	bx-python
+gops_subtract_1	bx-python
+gops_complement_1	bx-python
+gops_cluster_1	bx-python
+gff3.rebase	gff3_rebase
+gops_coverage_1	bx-python
+gops_merge_1	bx-python
+gops_intersect_1	bx-python
+flanking_features_1	bx-python
+get_flanks1	bx-python
+subtract_query1	bx-python
+gffcompare	gffcompare
+sample_seqs	biopython
+seq_filter_by_id	biopython
+rxlr_motifs	signalp
+crossmap_bam	crossmap
+samtools_bam_to_cram	samtools
+crossmap_region	crossmap
+crossmap_bed	crossmap
+crossmap_gff	crossmap
+crossmap_vcf	crossmap
+crossmap_wig	crossmap
+msconvert	msconvert
+bed_to_protein_map	bed_to_protein_map
+gffcompare_to_bed	gffcompare
+idconvert	idconvert
+msconvert_subset	msconvert
+idconvert	idconvert
+bigwig_to_bedgraph	bigwig_to_bedgraph
+fastp	fastp
+cshl_fastx_clipper	clip
+rcorrector	recorrector
+filtlong	filtlong
+trimmomatic	trimmomatic
+fasta_compute_length	compute_sequence_length
+fastq_quality_trimmer	fastx-toolkit
+fastq_to_fasta_python	fastx-toolkit
+cshl_fastx_renamer	chsl_fastx_renamer
+cshl_fastx_reverse_complement	cshl_fastx_reverse_complement
+cshl_fastx_trimmer	cshl_fastx_trimmer
+cshl_fastq_to_fasta	fastx-toolkit
+cshl_fastx_quality_statistics	cshl_fastx_quality_statistics
+cshl_fastq_quality_boxplot	fastx-toolkit
+cshl_fastq_quality_converter	fastx-toolkit
+cshl_fastq_quality_filter	fastx-toolkit
+cshl_fasta_formatter	fastx-toolkit
+cshl_fasta_nucleotides_changer	fastx-toolkit
+cshl_fastx_collapser	cshl_fastx_collapser
+cshl_fastx_artifacts_filter	cshl_fastx_artifacts_filter
+exonerate	exonerate
+sickle	sickle
+flash	flash
+seqtk_comp	seqtk
+seqtk_mutfa	seqtk
+seqtk_hety	seqtk
+seqtk_cutN	seqtk
+seqtk_mergefa	seqtk
+seqtk_trimfq	seqtk
+seqtk_fqchk	seqtk
+seqtk_randbase	seqtk
+seqtk_subseq	seqtk
+seqtk_dropse	seqtk
+seqtk_mergepe	seqtk
+seqtk_seq	seqtk
+seqtk_listhet	seqtk
+seqtk_listhet	seqtk
+mqc	mQC
+cshl_fastx_nucleotides_distribution	cshl_fastx_nucleotides_distribution
+cshl_fastx_barcode_splitter	cshl_princeton_fastx_barcode_splitter
+lighter	lighter
+qualimap_counts	qualimap
+samtools_coverage	samtools
+bamtools	bamtools
+bamFilter	bamtools
+bamtools_split_paired	bamtools
+bamtools_split_ref	bamtools
+bamtools_split_mapped	bamtools
+bamtools_split_tag	bamtools
+samtools_phase	samtools
+samtools_fastx	samtools
+samtools_view	samtools
+samtools_stats	samtools
+samtools_split	samtools
+samtools_flagstat	samtools
+samtools_markdup	samtools
+samtools_slice_bam	samtools
+samtools_idxstats	samtools
+samtools_sort	samtools
+samtools_bedcov	samtools
+bamutil_diff	bamutil
+samtools_reheader	samtools
+qualimap_bamqc	qualimap
+sam_pileup	samtools
+qualimap_multi_bamqc	qualimap
+bamtools_split	bamtools
+samtools_mpileup	samtools
+samtools_calmd	samtools
+samtools_merge	samtools
+samtools_depth	samtools
+samtools_fixmate	samtools
+samtool_filter2	samtools
+ngsutils_bam_filter	ngsutils
+samtools_rmdup	samtools
+sam_merge2	Broken link in tool shed
+bamhash	bamhash
+bedtools_annotatebed	bedtools
+bedtools_bed12tobed6	bedtools
+bedtools_bedtobam	bedtools
+bedtools_bedtoigv	bedtools
+bedtools_bedpetobam	bedtools
+bedtools_closestbed	bedtools
+bedtools_clusterbed	bedtools
+bedtools_complementbed	bedtools
+bedtools_coveragebed	bedtools
+bedtools_expandbed	bedtools
+bedtools_fisher	bedtools
+bedtools_flankbed	bedtools
+bedtools_genomecoveragebed	bedtools
+bedtools_getfastabed	bedtools
+bedtools_groupbybed	bedtools
+bedtools_intersectbed	bedtools
+bedtools_jaccard	bedtools
+bedtools_links	bedtools
+bedtools_makewindowsbed	bedtools
+bedtools_map	bedtools
+bedtools_maskfastabed	bedtools
+bedtools_mergebed	bedtools
+bedtools_multicovtbed	bedtools
+bedtools_multiintersectbed	bedtools
+bedtools_nucbed	bedtools
+bedtools_overlapbed	bedtools
+bedtools_randombed	bedtools
+bedtools_reldistbed	bedtools
+bedtools_shufflebed	bedtools
+bedtools_slopbed	bedtools
+bedtools_sortbed	bedtools
+bedtools_spacingbed	bedtools
+bedtools_subtractbed	bedtools
+bedtools_tagbed	bedtools
+bedtools_unionbedgraph	bedtools
+bedtools_windowbed	bedtools
+gffcompare	bedtools
+bedtools_bamtofastq	bedtools
+bedtools_genomecoveragebed_bedgraph	bedtools
+bedtools_mergebedgraph	bedtools
+bedtools_genomecoveragebed_histogram	bedtools
+varscan_somatic	varscan
+varscan_copynumber	varscan
+bcftools_csq	bcftools
+bcftools_cnv	bcftools
+bcftools_consensus	bcftools
+bcftools_norm	bcftools
+bcftools_call	bcftools
+vcfcheck	vcflib
+vcffilter2	vcflib
+vcfselectsamples	vcflib
+vcfannotategenotypes	vcflib
+vcfflatten2	vcflib
+vcfcommonsamples	vcflib
+vcfannotate	vcflib
+vcfvcfintersect	vcflib
+vcfbreakcreatemulti	vcflib
+vcfallelicprimitives	vcflib
+vcfgeno2haplo	vcflib
+vcffixup	vcflib
+vcfgenotypes	vcflib
+vcfbedintersect	vcflib
+vcfrandomsample	vcflib
+vcfhethom	vcflib
+vcfsort	vcflib
+vcfprimers	vcflib
+vcfcombine	vcflib
+vcfleftalign	vcflib
+vcf2tsv	vcflib
+vcfaddinfo	vcflib
+varscan	varscan
+varscan_mpileup	varscan
+bcfview	bcftools
+freebayes	freebayes
+vcfdistance	vcflib
+snippy	snippy
+snippy_core	snippy
+bamleftalign	freebayes
+vcfdistance	vcflib
+vcftools_merge	vcftools
+vcftools_isec	vcftools
+vt_normalize	vt
+vcftools_compare	vcftools
+vcftools_annotate	vcftools
+vcftools_slice	vcftools
+vcftools_subset	vcftools
+medaka_variant_pipeline	medaka
+medaka_variant	medaka
+medaka_consensus	medaka
+ngmlr	ngmlr
+medaka_consensus_pipeline	medaka
+nanocompore_db	Nanocompore
+nanoplot	nanoplot
+nanopolish_polya	nanopolish
+nanopolish_eventalign	nanopolish
+nanopolish_methylation	nanopolish
+nanopolish_variants	nanopolish
+nanocompore_sampcomp	Nanocompore
+nanopolishcomp_freqmethcalculate	nanopolish
+nanopolishcomp_eventaligncollapse	nanopolish
+poretools_times	poretools
+poretools_nucdist	poretools
+poretools_qualdist	poretools
+poretools_extract	poretools
+poretools_tabular	poretools
+poretools_stats	poretools
+poretools_squiggle	poretools
+poretools_occupancy	poretools
+poretools_hist	poretools
+poretools_yield_plot	poretools
+poretools_qualpos	poretools
+poretools_winner	poretools
+poretools_events	poretools
+gops_complement_1	bx-python
+gops_cluster_1	bx-python
+gops_basecoverage_1	bx-python
+Annotation_Profiler_0	bx-python
+translate_bed	biopython
+gops_concat_1	bx-python
+gops_join_1	bx-python
+translate_bed_sequences	biopython
+Extract genomic DNA 1	bx-python
+fraggenescan	fraggenescan
+repeatmodeler	repeatmodeler
+promoter2	promoter
+Psortb	psortb
+rxlr_motifs	signalp hmmer2
+signalp3	signalp
+tmhmm2	tmhmm
+wolf_psort	wolf_psort
+tbvcfreport	combat-tb_workbench
+tb_profiler_profile	tb-profiler
+homer_annotatePeaks	homer
+funannotate_annotate	funannotate
+funannotate_predict	funannotate
+tb_variant_filter	combat-tb_workbench
+augustus_training	augustus
+augustus	augustus
+chipseeker	chipseeker
+spotyping	spotyping
+hmmer_hmmbuild	hmmer3
+hmmer_hmmscan	hmmer3
+annotatemyids	annotatemyids
+mitos2	mitos
+sistr_cmd	SISTR
+hhsearch	hhsuite
+optitype	optitype
+hmmer_nhmmer	hmmer3
+hmmer_phmmer	hmmer3
+hmmer_jackhmmer	hmmer3
+hmmer_nhmmscan	hmmer3
+hmmer_hmmsearch	hmmer3
+tbl2gff3	tbl2gff3
+hmmer_hmmemit	hmmer3
+hmmer_hmmalign	hmmer3
+homer_gtf_to_annotations	homer
+funannotate_clean	funannotate
+funannotate_sort	funannotate
+funannotate_compare	funannotate
+hmmer_hmmfetch	hmmer3
+hmmer_alimask	hmmer3
+hmmer_hmmconvert	hmmer3
+mob_recon	mob-suite
+mob_typer	mob-suite
+seq2hla	seq2hla
+mitos	mitos
+ectyper	ectyper
+antismash	antismash
+xmfa2gff3	mauve
+mlst_list	mlst
+mlst	mlst
+exonerate	exonerate
+fastani	fastani
+kobas_annotate	kobas
+kobas_identify	kobas
+gprofiler_snpense	gprofiler
+gprofiler_random	gprofiler
+gprofiler_gost	gprofiler
+gprofiler_orth	gprofiler
+gprofiler_convert	gprofiler
+blastxml_to_gapped_gff3	blastxml_to_gapped_gff3
+snap_training	snap
+fgsea	fgsea
+bg_sortmerna	sortmerna
+goslimmer	goenrichment
+goenrichment	goenrichment
+hammock_1.0	hammock
+picrust_metagenome_contributions	picrust
+picrust_format_tree_and_trait_table	picrust
+picrust_compare_biom	picrust
+picrust_predict_metagenomes	picrust
+picrust_categorize	picrust
+trnascan	trnascan-se
+aragorn_trna	aragorn
+transtermhp	transtermhp
+gubbins	gubbins
+Probmetab	probmetab
+lcmsmatching	workflow4metabolomics
+blast2go	blast2go
+hmmer_nhmmer	hmmer3
+hmmer_hmmsearch	hmmsearch
+hmmer_hmmconvert	hmmsearch
+hmmer_hmmfetch	hmmsearch
+hmmer_jackhmmer	hmmsearch
+hmmer_alimask	hmmsearch
+hmmer_hmmscan	hmmsearch
+hmmer_nhmmscan	hmmsearch
+hmmer_hmmemit	hmmsearch
+hmmer_phmmer	hmmsearch
+hmmer_hmmalign	hmmsearch
+hmmer_hmmbuild	hmmsearch
+rbc_gotohscan	GotohScan
+CryptoGenotyper	CryptoGenotyper
+rbc_mafft_add	MAFFT
+rbc_mafft	MAFFT
+clustalw	clustalw
+sina	sina
+gecko	gecko
+hammock_1.0	hammock
+muscle	muscle
+raven	raven
+spades_coronaspades	coronaspades
+spades_plasmidspades	plasmidspades
+spades	spades
+metaspades	metaspades
+rnaspades	rnaspades
+trycycler_cluster	trycycler
+trycycler_consensus	trycycler
+trycycler_partition	trycycler
+trycycler_reconcile_msa	trycycler
+trycycler_subsample	trycycler
+flye	Flye
+genomescope	GenomeScope_2.0
+miniasm	miniasm
+racon	Racon
+lordec	lordec
+shasta	shasta
+idba_tran	idba
+unicycler	unicycler
+idba_ud	idba
+idba_hybrid	idba
+velvetoptimiser	velvetoptimiser
+pilon	pilon
+wtdbg	wtdbg2
+mira_assembler	mira
+edena_ass_wrapper	edena
+edena_ovl_wrapper	edena
+sopra_wpc	sopra
+ssake	ssake
+minced	minced
+bbtools_bbmap	bbmap
+kma_map	kma
+hisat2	hisat2
+bwa_mem	bwa
+lastz_paired_reads_wrapper	lastz
+bowtie_wrapper	bowtie
+bismark_bowtie2	bismark
+star_fusion	star-fusion
+bismark_deduplicate	bismark
+bismark_pretty_report	bismark
+bismark_methylation_extractor	bismark
+segemehl	segemehl
+bismark_bowtie	bismark
+bwa	bwa
+tophat2	tophat2
+pharmcat	pharmcat
+varscan_somatic	varscan
+varscan_copynumber	varscan
+varscan_mpileup	varscan
+delly_classify	delly2
+deepvariant	deepvariant
+snippy_core	snippy
+snippy	snippy
+snippy_clean_full_aln	snippy
+lumpy_sv	lumpy
+beagle	beagle
+irissv	iris
+jasminesv	jasmine-sv
+strelka_germline	strelka
+strelka_somatic	strelka
+lumpy_prep	lumpy
+vardict_java	vardict
+artic_guppyplex	artic
+snpSift_filter	snpsift
+lofreq_filter	lofreq
+lofreq_call	lofreq
+cutesv	cuteSV
+sniffles	sniffles
+snpeff_sars_cov_2	snpeff
+lofreq_viterbi	lofreq
+lofreq_alnqual	lofreq
+lofreq_indelqual	lofreq
+odgi_viz	odgi
+odgi_build	odgi
+vg_view	vg
+vg_deconstruct	vg
+vg_convert	vg
+snpEff_get_chr_names	snpeff
+exomedepth	exomedepth
+snpEff_build_gb	snpeff
+mixcr_analyze	mixcr
+snpEff_databases	snpeff
+snpEff_download	snpeff
+snpSift_int	snpsift
+snpSift_rmInfo	snpsift
+snpSift_annotate	snpsift
+snpsift_vartype	snpsift
+snpSift_caseControl	snpsift
+snpSift_extractFields	snpsift
+snpSift_vcfCheck	snpsift
+snpEff	snpeff
+snpSift_geneSets	snpsift
+snpSift_dbnsfp	snpsift
+snpSift_dbnsfp_generic	snpsift
+SnpEff-cds-report	snpeff
+snpeff_to_peptides	snpeff
+snpSift_int	snpsift
+snpSift_annotate	snpsift
+snpSift_filter	snpsift
+snpSift_caseControl	snpsift
+mageck_test	mageck
+mageck_mle	mageck
+mageck_gsea	mageck
+mageck_count	mageck
+mageck_pathway	mageck
+plotdexseq	dexseq
+seurat	seurat
+alleyoop	SLAM-DUNK
+slamdunk	SLAM-DUNK
+cuffmerge	cufflinks
+salmonquantmerge	salmon
+egsea	egsea
+targetfinder	targetfinder.org
+migmap	MiGMAP
+kallisto_pseudo	kallisto
+kallisto_quant	kallisto
+ruvseq	ruvseq
+salmon	salmon
+genomic_super_signature	genomicsupersignature
+express	express
+masigpro	masigpro
+cufflinks	cufflinks
+cuffdiff	cuffdiff
+cuffcompare	cuffcompare
+scpipe	scpipe
+cuffnorm	cufflinks
+cummeRbund	cummerbund
+htseq_count	htseqcount
+graphprot_predict_profile	graphprot
+heinz_visualization	heinz
+qualimap_counts	qualimap
+qualimap_rnaseq	qualimap
+bg_sortmerna	sortmerna
+glassgo	glassgo
+intarna	intarna
+trinity_analyze_diff_expr	trinity
+rnaz_cluster	rnaz
+dr_disco_classify	dr_disco
+dr_disco_fix	dr_disco
+dr_disco_bam_extract	dr_disco
+dr_disco_integrate	dr_disco
+dr_disco_detect	dr_disco
+mea	mea
+rnaz_randomize_aln	rnaz
+rnaz_select_seqs	rnaz
+rnaz_window	rnaz
+rnaz_annotate	rnaz
+locarna_multiple	locarna
+ribotaper_create_metaplots	ribotaper
+ribotaper_ribosome_profiling	ribotaper
+ribotaper_create_annotation	ribotaper
+pipmir	pipmir
+nastiseq	nastiseq
+flaimapper	flaimapper
+AREsite2_REST	aresite
+fuma	fuma
+RNAlien	rnalien
+trinity_samples_qccheck	trinity
+describe_samples	trinity
+trinity_define_clusters_by_cutting_tree	trinity
+rseqc_geneBody_coverage	resqc
+heinz_bum	heinz
+heinz	heinz
+heinz_scoring	heinz
+pizzly	pizzly
+rcas	rcas
+rseqc_geneBody_coverage2	rseqc
+rseqc_RPKM_saturation	rseqc
+rseqc_infer_experiment	rseqc
+rseqc_RNA_fragment_size	rseqc
+rseqc_tin	rseqc
+rseqc_junction_saturation	rseqc
+rseqc_FPKM_count	rseqc
+rseqc_read_distribution	rseqc
+rseqc_junction_annotation	rseqc
+rseqc_inner_distance	rseqc
+rnaz	rnaz
+RNAshapes	rnashpaes
+viennarna_rnafold	vienna_rna_package
+idr	idr
+viennarna_rnacofold	vienna_rna_package
+viennarna_rnaalifold	vienna_rna_package
+rseqc_deletion_profile	rseqc
+rseqc_read_NVC	rseqc
+rseqc_bam_stat	rseqc
+rseqc_read_duplication	rseqc
+rseqc_read_GC	rseqc
+rseqc_insertion_profile	rseqc
+rseqc_bam2wig	rseqc
+rseqc_clipping_profile	rseqc
+rseqc_read_quality	resqc
+rseqc_read_hexamer	resqc
+rseqc_mismatch_profile	resqc
+segemehl	segemehl
+sailfish	sailfish
+cuffquant	cufflinks
+viennarna_rnaeval	viennarna
+viennarna_rnaplex	viennarna
+viennarna_rna2dfold	viennarna
+viennarna_rnapaln	viennarna
+viennarna_rnaplot	viennarna
+viennarna_rnasnoop	viennarna
+viennarna_kinfold	viennarna
+viennarna_rnaaliduplex	viennarna
+viennarna_rnaduplex	viennarna
+viennarna_rnadistance	viennarna
+viennarna_rnadpdist	viennarna
+viennarna_rnalfold	viennarna
+viennarna_rnapkplex	viennarna
+viennarna_rnaup	viennarna
+viennarna_rnalalifold	viennarna
+viennarna_rnainverse	viennarna
+viennarna_rnaheat	viennarna
+viennarna_rnasubopt	viennarna
+rnasnp	rnasnp
+mlocarna	locarna
+paralyzer	paralyzer
+rbc_rnacommender	rnacommender
+rseqc_RPKM_count	rseqc
+tophat_fusion_post	tophat-fusion
+blockbuster	blockbuster
+rbc_kinwalker	kinwalker
+antarna	antarna
+cummerbund_to_cuffdiff	cummerbund
+rbc_mirdeep2_mapper	mirdeep2
+rbc_mirdeep2_quantifier	mirdeep2
+rbc_mirdeep2	mirdeep2
+rsem_prepare_reference	rsem
+rsem_calculate_expression	rsem
+extract_transcript_to_gene_map_from_trinity	rsem
+peakcalling_ccat	ccat
+peakcalling_macs	macs
+peakcalling_sicer	sicer
+diffbind	diffbind
+peakachu	peakachu
+jamm	jamm
+piranha	piranha-peak
+pileometh	methyldackel
+minfi_ppquantile	ewastools
+minfi_rset	ewastools
+minfi_dropsnp	ewastools
+minfi_mset	ewastools
+minfi_read450k	ewastools
+minfi_ppfun	ewastools
+minfi_dmp	ewastools
+minfi_dmr	ewastools
+minfi_getcn	ewastools
+minfi_getbeta	ewastools
+minfi_getsnp	ewastools
+minfi_maptogenome	ewastools
+minfi_getM	ewastools
+minfi_qc	ewastools
+minfi_analysis	ewastools
+hicup_truncater	hicup
+hicup_hicup	hicup
+hicup_filter	hicup
+hicup_digester	hicup
+hicup_deduplicator	hicup
+hicup_mapper	hicup
+hyphy_cfel	HyPhy
+hyphy_strike_ambigs	HyPhy
+hyphy_conv	HyPhy
+nextclade	nextstrain.org
+hyphy_summary	HyPhy
+hyphy_annotate	HyPhy
+t_coffee	tcoffee
+raxml	raxml
+gstf_preparation	geneseqtofamily
+phyml	phyml
+blast_parser	blast
+hgv_hilbertvis	hilbertvis
+ctdBatch_1	ctd
+music_construct_eset	popmusic
+music_deconvolution	popmusic
+music_compare	popmusic
+alevin	Alevin
+music_inspect_eset	popmusic
+dropletutils_read_10x	dropletutils
+dropletutils_empty_drops	dropletutils
+ip_slice_image	scikit-image
+scanpy_parameter_iterator	scanpy
+scater_plot_exprs_freq	scater
+scater_normalize	scater
+picard_CollectBaseDistributionByCycle	picard
+picard_AddOrReplaceReadGroups	picard
+picard_MeanQualityByCycle	picard
+picard_RevertOriginalBaseQualitiesAndAddMateCigar	picard
+picard_CollectHsMetrics	picard
+picard_SortSam	picard
+picard_RevertSam	picard
+picard_FixMateInformation	picard
+picard_CASM	picard
+picard_NormalizeFasta	picard
+picard_DownsampleSam	picard
+picard_MergeBamAlignment	picard
+picard_MarkDuplicatesWithMateCigar	picard
+picard_CleanSam	picard
+picard_MergeSamFiles	picard
+picard_MarkDuplicates	picard
+picard_ValidateSamFile	picard
+picard_QualityScoreDistribution	picard
+picard_CollectRnaSeqMetrics	picard
+picard_BedToIntervalList	picard
+picard_CollectWgsMetrics	picard
+picard_artifact_metrics	picard
+picard_CollectGcBiasMetrics	picard
+picard_FilterSamReads	picard
+picard_AddCommentsToBam	picard
+picard_EstimateLibraryComplexity	picard
+picard_CollectInsertSizeMetrics	picard
+PicardASMetrics	picard
+picard_BamIndexStats	picard
+picard_ARRG	picard
+rgEstLibComp	picard
+PicardInsertSize	picard
+rgPicFixMate	picard
+deeptools_bam_compare	deeptools
+deeptools_bam_pe_fragmentsize	deeptools
+deeptools_multi_bam_summary	deeptools
+deeptools_compute_matrix	deeptools
+deeptools_plot_enrichment	deeptools
+deeptools_bam_coverage	deeptools
+deeptools_bigwig_compare	deeptools
+deeptools_plot_heatmap	deeptools
+deeptools_correct_gc_bias	deeptools
+deeptools_alignmentsieve	deeptools
+deeptools_compute_matrix_operations	deeptools
+deeptools_plot_fingerprint	deeptools
+deeptools_plot_coverage	deeptools
+deeptools_plot_correlation	deeptools
+deeptools_plot_profile	deeptools
+deeptools_multi_bigwig_summary	deeptools
+deeptools_compute_gc_bias	deeptools
+deeptools_plot_pca	deeptools
+deeptools_estimatereadfiltering	deeptools
+hicup_deduplicator	hicup
+gemini_query	gemini
+gemini_annotate	gemini
+gemini_load	gemini
+scanpy_parameter_iterator	scanpy
+scater_plot_exprs_freq	scater
+scater_normalize	scater
+picard_CollectBaseDistributionByCycle	picard_tools
+picard_AddOrReplaceReadGroups	picard_tools
+picard_MeanQualityByCycle	picard_tools
+picard_RevertOriginalBaseQualitiesAndAddMateCigar	picard_tools
+picard_CollectHsMetrics	picard_tools
+picard_SortSam	picard_tools
+picard_RevertSam	picard_tools
+picard_FixMateInformation	picard_tools
+picard_CASM	picard_tools
+picard_NormalizeFasta	picard_tools
+picard_DownsampleSam	picard_tools
+picard_MergeBamAlignment	picard_tools
+picard_MarkDuplicatesWithMateCigar	picard_tools
+picard_CleanSam	picard_tools
+picard_MergeSamFiles	picard_tools
+picard_MarkDuplicates	picard_tools
+picard_ValidateSamFile	picard_tools
+picard_QualityScoreDistribution	picard_tools
+picard_CollectRnaSeqMetrics	picard_tools
+picard_BedToIntervalList	picard_tools
+picard_CollectWgsMetrics	picard_tools
+picard_artifact_metrics	picard_tools
+picard_CollectGcBiasMetrics	picard_tools
+picard_FilterSamReads	picard_tools
+picard_AddCommentsToBam	picard_tools
+picard_EstimateLibraryComplexity	picard_tools
+picard_CollectInsertSizeMetrics	picard_tools
+PicardASMetrics	picard_tools
+picard_BamIndexStats	picard_tools
+picard_ARRG	picard_tools
+rgEstLibComp	picard_tools
+PicardInsertSize	picard_tools
+rgPicFixMate	picard_tools
+deeptools_bam_compare	deeptools
+deeptools_bam_pe_fragmentsize	deeptools
+deeptools_multi_bam_summary	deeptools
+deeptools_compute_matrix	deeptools
+deeptools_plot_enrichment	deeptools
+deeptools_bam_coverage	deeptools
+deeptools_bigwig_compare	deeptools
+deeptools_plot_heatmap	deeptools
+deeptools_correct_gc_bias	deeptools
+deeptools_alignmentsieve	deeptools
+deeptools_compute_matrix_operations	deeptools
+deeptools_plot_fingerprint	deeptools
+deeptools_plot_coverage	deeptools
+deeptools_plot_correlation	deeptools
+deeptools_plot_profile	deeptools
+deeptools_multi_bigwig_summary	deeptools
+deeptools_compute_gc_bias	deeptools
+deeptools_plot_pca	deeptools
+deeptools_estimatereadfiltering	deeptools
+hicup_deduplicator	hicup
+gemini_query	gemini
+gemini_annotate	gemini
+gemini_load	gemini
+gemini_db_info	gemini
+gemini_pathways	gemini
+gemini_windower	gemini
+gemini_inheritance	gemini
+gemini_interactions	gemini
+gemini_qc	gemini
+gemini_set_somatic	gemini
+gemini_roh	gemini
+gemini_fusions	gemini
+gemini_lof_sieve	gemini
+gemini_actionable_mutations	gemini
+gemini_amend	gemini
+gemini_stats	gemini
+gemini_gene_wise	gemini
+gemini_burden	gemini
+EMBOSS: pepwheel72	emboss
+EMBOSS: wordcount109	emboss
+EMBOSS: trimest102	emboss
+EMBOSS: pepwindow73	emboss
+EMBOSS: pepwindowall74	emboss
+EMBOSS: charge8	emboss
+EMBOSS: degapseq20	emboss
+EMBOSS: infoseq46	emboss
+EMBOSS: splitter92	emboss
+EMBOSS: skipseq91	emboss
+EMBOSS: needle56	emboss
+EMBOSS: patmatdb67	emboss
+EMBOSS: marscan49	emboss
+EMBOSS: water107	emboss
+EMBOSS: getorf42	emboss
+EMBOSS: lindna48	emboss
+EMBOSS: msbar55	emboss
+EMBOSS: oddcomp64	emboss
+EMBOSS: fuzztran39	emboss
+EMBOSS: tcode97	emboss
+EMBOSS: pepcoil68	emboss
+EMBOSS: helixturnhelix43	emboss
+EMBOSS: iep45	emboss
+EMBOSS: merger54	emboss
+EMBOSS: equicktandem31	emboss
+EMBOSS: newcpgseek58	emboss
+EMBOSS: extractseq35	emboss
+EMBOSS: dreg27	emboss
+EMBOSS: maskfeat50	emboss
+EMBOSS: newcpgreport57	emboss
+EMBOSS: codcmp12	emboss
+EMBOSS: dottup26	emboss
+EMBOSS: supermatcher95	emboss
+EMBOSS: nthseq62	emboss
+EMBOSS: primersearch81	emboss
+EMBOSS: fuzznuc37	emboss
+EMBOSS: cutseq18	emboss
+EMBOSS: tranalign100	emboss
+EMBOSS: fuzzpro38	emboss
+EMBOSS: cai_custom6	emboss
+EMBOSS: noreturn60	emboss
+EMBOSS: dotpath25	emboss
+EMBOSS: etandem33	emboss
+EMBOSS: octanol63	emboss
+EMBOSS: sigcleave88	emboss
+EMBOSS: wobble108	emboss
+EMBOSS: wordmatch110	emboss
+EMBOSS: union105	emboss
+EMBOSS: megamerger53	emboss
+EMBOSS: preg78	emboss
+EMBOSS: prettyseq80	emboss
+EMBOSS: prettyplot79	emboss
+EMBOSS: einverted28	emboss
+EMBOSS: sixpack90	emboss
+EMBOSS: syco96	emboss
+EMBOSS: cpgreport16	emboss
+EMBOSS: pepstats71	emboss
+EMBOSS: palindrome65	emboss
+EMBOSS: hmoment44	emboss
+EMBOSS: twofeat104	emboss
+EMBOSS: digest23	emboss
+EMBOSS: extractfeat34	emboss
+EMBOSS: showfeat85	emboss
+EMBOSS: shuffleseq87	emboss
+EMBOSS: dotmatcher24	emboss
+EMBOSS: seqmatchall83	emboss
+EMBOSS: matcher52	emboss
+EMBOSS: revseq82	emboss
+EMBOSS: plotcon75	emboss
+EMBOSS: trimseq103	emboss
+EMBOSS: pasteseq66	emboss
+EMBOSS: est2genome32	emboss
+EMBOSS: diffseq22	emboss
+EMBOSS: vectorstrip106	emboss
+EMBOSS: polydot77	emboss
+EMBOSS: transeq101	emboss
+EMBOSS: isochore47	emboss
+EMBOSS: backtranseq2	emboss
+EMBOSS: compseq14	emboss
+EMBOSS: freak36	emboss
+EMBOSS: pepinfo69	emboss
+EMBOSS: checktrans9	emboss
+EMBOSS: antigenic1	emboss
+EMBOSS: banana3	emboss
+EMBOSS: dan19	emboss
+EMBOSS: epestfind29	emboss
+EMBOSS: maskseq51	emboss
+EMBOSS: geecee41	emboss
+EMBOSS: cpgplot15	emboss
+EMBOSS: notseq61	emboss
+EMBOSS: seqret84	emboss
+EMBOSS: plotorf76	emboss
+EMBOSS: cai6	emboss
+EMBOSS: btwisted5	emboss
+EMBOSS: newseq59	emboss
+EMBOSS: chaos7	emboss
+EMBOSS: pepnet70	emboss
+EMBOSS: textsearch98	emboss
+EMBOSS: chips10	emboss
+EMBOSS: garnier40	emboss
+EMBOSS: cusp17	emboss
+EMBOSS: descseq21	emboss
+EMBOSS: cirdna11	emboss
+EMBOSS: tmap99	emboss
+EMBOSS: sirna89	emboss
+EMBOSS: coderet13	emboss
+EMBOSS: biosed4	emboss
+blastxml_to_tabular	blast
+get_species_taxids	blast
+ncbi_blastdbcmd_info	blast
+ncbi_blastdbcmd_wrapper	blast
+ncbi_blastn_wrapper	blast
+ncbi_blastp_wrapper	blast
+ncbi_blastx_wrapper	blast
+ncbi_convert2blastmask_wrapper	blast
+ncbi_dustmasker_wrapper	blast
+ncbi_makeblastdb	blast
+ncbi_makeprofiledb	blast
+ncbi_rpsblast_wrapper	blast
+ncbi_rpstblastn_wrapper	blast
+ncbi_segmasker_wrapper	blast
+ncbi_tblastn_wrapper	blast
+ncbi_tblastx_wrapper	blast
+bbtools_bbduk	bbmap
+bg_diamond	diamond
+bg_diamond_makedb	diamond
+bg_diamond_view	diamond
+taxonomy_krona_chart	taxonomy_krona_chart
+bbtools_bbmap	bbmap
+bbtools_callvariants	bbmap
+kraken-translate	kraken
+kraken-filter	kraken
+hicexplorer_hicplotviewpoint	hicexplorer
+hicexplorer_hicplotmatrix	hicexplorer
+hicexplorer_hicfindtads	hicexplorer
+hicexplorer_hiccomparematrices	hicexplorer
+hicexplorer_hicaggregatecontacts	hicexplorer
+hicexplorer_hicnormalize	hicexplorer
+hicexplorer_hicsummatrices	hicexplorer
+hicexplorer_hicconvertformat	hicexplorer
+hicexplorer_hicadjustmatrix	hicexplorer
+hicexplorer_hicinfo	hicexplorer
+hicexplorer_hichyperoptDetectLoops	hicexplorer
+schicexplorer_schicqualitycontrol	hicexplorer
+hicexplorer_chicplotviewpoint	hicexplorer
+hicexplorer_chicdifferentialtest	hicexplorer
+hicexplorer_chicaggregatestatistic	hicexplorer
+hicexplorer_chicsignificantinteractions	hicexplorer
+hicexplorer_chicviewpoint	hicexplorer
+hicexplorer_hicdifferentialtad	hicexplorer
+hicexplorer_hicmergedomains	hicexplorer
+hicexplorer_chicqualitycontrol	hicexplorer
+hicexplorer_hicfindrestrictionsites	hicexplorer
+hicexplorer_chicviewpointbackgroundmodel	hicexplorer
+hicexplorer_hicquickqc	hicexplorer
+hicexplorer_hicbuildmatrix	hicexplorer
+hicexplorer_hicmergematrixbins	hicexplorer
+hicexplorer_hictransform	hicexplorer
+hicexplorer_hiccompartmentspolarization	hicexplorer
+hicexplorer_hiccorrelate	hicexplorer
+hicexplorer_hicdetectloops	hicexplorer
+hicexplorer_hicmergeloops	hicexplorer
+hicexplorer_hicvalidatelocations	hicexplorer
+hicexplorer_hiccorrectmatrix	hicexplorer
+hicexplorer_hicpca	hicexplorer
+hicexplorer_hicplotaverageregions	hicexplorer
+hicexplorer_hicplotdistvscounts	hicexplorer
+hicexplorer_hicaverageregions	hicexplorer
+hicexplorer_hicplotsvl	hicexplorer
+schicexplorer_schiccorrectmatrices	hicexplorer
+schicexplorer_schicplotconsensusmatrices	hicexplorer
+schicexplorer_schicplotclusterprofiles	hicexplorer
+schicexplorer_schicnormalize	hicexplorer
+schicexplorer_schiccreatebulkmatrix	hicexplorer
+schicexplorer_schicmergetoscool	hicexplorer
+schicexplorer_schicmergematrixbins	hicexplorer
+schicexplorer_schicinfo	hicexplorer
+schicexplorer_schicdemultiplex	hicexplorer
+schicexplorer_schicconsensusmatrices	hicexplorer
+schicexplorer_schicclustersvl	hicexplorer
+schicexplorer_schicclusterminhash	hicexplorer
+schicexplorer_schicclustercompartments	hicexplorer
+schicexplorer_schiccluster	hicexplorer
+schicexplorer_schicadjustmatrix	hicexplorer
+hicexplorer_hicplottads	hicexplorer
+stacks2_shortreads	stacks
+stacks2_refmap	stacks
+stacks2_denovomap	stacks
+stacks2_procrad	stacks
+stacks2_populations	stacks
+stacks2_gstacks	stacks
+stacks2_ustacks	stacks
+stacks2_kmerfilter	stacks
+stacks2_clonefilter	stacks
+stacks2_tsv2bam	stacks
+stacks2_sstacks	stacks
+BayeScan	bayescan
+stacks2_cstacks	stacks
+NSPDK_candidateClust	graphclust, GraphClust2
+structure_to_gspan	graphclust, GraphClust2
+preproc	graphclust, GraphClust3
+preMloc	graphclust, GraphClust4
+nspdk_sparse	graphclust, GraphClust5
+locarna_best_subtree	graphclust, GraphClust6
+gspan	graphclust, GraphClust7
+glob_report	graphclust, GraphClust8
+cmFinder	graphclust, GraphClust9
+graphclust_align_cluster	graphclust, GraphClust10
+graphclust_aggregate_alignments	graphclust, GraphClust11
+graphclust_glob_report_no_align	graphclust, GraphClust12
+motifFinderPlot	graphclust, GraphClust13
+infernal_cmbuild	infernal
+infernal_cmsearch	infernal
+infernal_cmstat	infernal
+customize_metaphlan_database	metaphlan, seqtk
+merge_metaphlan_tables	metaphlan
+metabat2_jgi_summarize_bam_contig_depths	MetaBAT_2
+est_abundance	bracken
+kraken2	kraken2
+kraken	kraken
+kraken-report	kraken
+kraken-mpa-report	kraken
+metaphlan	metaphlan
+extract_metaphlan_database	metaphlan
+metabat2	MetaBAT_2
+kraken-translate	kraken
+kraken-filter	kraken
+taxonomy_krona_chart	krona
+kraken_taxonomy_report	biopython
+dada2_plotQualityProfile	dada2
+dada2_mergePairs	dada2
+dada2_assignTaxonomyAddspecies	dada2
+dada2_makeSequenceTable	dada2
+dada2_learnErrors	dada2
+dada2_removeBimeraDenovo	dada2
+dada2_dada	dada2
+dada2_filterAndTrim	dada2
+jellyfish	jellyfish
+humann2	humann2
+last_db	last
+last_split	last
+last_train	last
+last_maf_convert	last
+khmer_abundance_distribution_single	khmer
+khmer_partition	khmer
+khmer_count_median	khmer
+khmer_abundance_distribution	khmer
+khmer_filter_below_abundance_cutoff	khmer
+khmer_filter_abundance	khmer
+scoary	scoary
+khmer_extract_partitions	khmer
+khmer_normalize_by_median	khmer
+mash_screen	mash
+dada2_seqCounts	dada2
+dada2_plotComplexity	dada2
+humann2_join_tables	humann2
+vsearch_search	vsearch
+humann2_associate	humann2
+humann2_barplot	humann2
+humann2_genefamilies_genus_level	humann2
+humann2_reduce_table	humann2
+humann2_regroup_table	humann2
+humann2_rename_table	humann2
+humann2_renorm_table	humann2
+humann2_rna_dna_norm	humann2
+humann2_split_stratified_table	humann2
+humann2_split_table	humann2
+humann2_strain_profiler	humann2
+humann2_unpack_pathways	humann2
+metagene_annotator	metageneannotator
+mash_sketch	mash
+cat_contigs	cat_bins
+cat_bins	cat_bins
+cat_add_names	cat_bins
+cat_summarise	cat_bins
+cat_prepare	cat_bins
+group_humann2_uniref_abundances_to_go	humann2
+vsearch_sorting	vsearch
+vsearch_chimera_detection	vsearch
+vsearch_clustering	vsearch
+vsearch_masking	vsearch
+vsearch_alignment	vsearch
+vsearch_dereplication	vsearch
+vsearch_shuffling	vsearch
+compare_humann2_output	humann2
+combine_metaphlan2_humann2	humann2
+format_metaphlan2_output	metaphlan
+valet	valet
+metaphlan2	metaphlan
+metaphlan2krona	metaphlan
+metaphlan_hclust_heatmap	metaphlan
+metagenomeseq_normalizaton	metagenomeseq
+qiime_collapse_samples	qiime
+qiime_make_otu_table	qiime
+qiime_pick_open_reference_otus	qiime
+qiime_pick_closed_reference_otus	qiime
+qiime_count_seqs	qiime
+qiime_extract_barcodes	qiime
+count_seqs	qiime
+qiime_make_emperor	qiime
+qiime_make_otu_heatmap	qiime
+qiime_pick_rep_set	qiime
+qiime_multiple_join_paired_ends	qiime
+qiime_align_seqs	qiime
+qiime_alpha_rarefaction	qiime
+pick_open_reference_otus	qiime
+pick_closed_reference_otus	qiime
+qiime_core_diversity	qiime
+qiime_alpha_diversity	qiime
+qiime_split_libraries_fastq	qiime
+qiime_filter_otus_from_otu_table	qiime
+qiime_jackknifed_beta_diversity	qiime
+qiime_filter_taxa_from_otu_table	qiime
+qiime_pick_otus	qiime
+qiime_compare_categories	qiime
+qiime_plot_taxa_summary	qiime
+qiime_upgma_cluster	qiime
+qiime_filter_fasta	qiime
+qiime_filter_alignment	qiime
+qiime_assign_taxonomy	qiime
+qiime_make_phylogeny	qiime
+qiime_summarize_taxa	qiime
+qiime_beta_diversity	qiime
+qiime_split_libraries	qiime
+qiime_filter_samples_from_otu_table	qiime
+qiime_summarize_taxa_through_plots	qiime
+qiime_multiple_split_libraries_fastq	qiime
+qiime_beta_diversity_through_plots	qiime
+qiime_validate_mapping_file	qiime
+mothur_screen_seqs	mothur
+mothur_make_contigs	mothur
+mothur_get_label	mothur
+mothur_chimera_vsearch	mothur
+mothur_chimera_pintail	mothur
+mothur_split_abund	mothur
+mothur_mimarks_attributes	mothur
+mothur_summary_single	mothur
+mothur_chop_seqs	mothur
+mothur_remove_otulabels	mothur
+mothur_get_sabund	mothur
+mothur_make_sra	mothur
+mothur_make_group	mothur
+mothur_trim_seqs	mothur
+mothur_nmds	mothur
+mothur_list_otulabels	mothur
+mothur_create_database	mothur
+mothur_deunique_tree	mothur
+mothur_biom_info	mothur
+mothur_pairwise_seqs	mothur
+mothur_merge_count	mothur
+mothur_pcr_seqs	mothur
+mothur_taxonomy_to_krona	mothur
+mothur_split_groups	mothur
+mothur_classify_tree	mothur
+mothur_make_fastq	mothur
+mothur_pcoa	mothur
+mothur_summary_shared	mothur
+mothur_sort_seqs	mothur
+mothur_remove_dists	mothur
+mothur_make_lefse	mothur
+mothur_cluster_classic	mothur
+mothur_filter_seqs	mothur
+mothur_unique_seqs	mothur
+mothur_rename_seqs	mothur
+mothur_cooccurrence	mothur
+mothur_parse_list	mothur
+mothur_get_group	mothur
+mothur_make_design	mothur
+mothur_get_dists	mothur
+mothur_get_otulist	mothur
+mothur_merge_groups	mothur
+mothur_otu_association	mothur
+mothur_merge_files	mothur
+mothur_filter_shared	mothur
+mothur_phylo_diversity	mothur
+mothur_sffinfo	mothur
+mothur_sub_sample	mothur
+mothur_deunique_seqs	mothur
+mothur_chimera_perseus	mothur
+mothur_amova	mothur
+mothur_align_check	mothur
+mothur_align_seqs	mothur
+mothur_classify_rf	mothur
+mothur_dist_seqs	mothur
+mothur_pre_cluster	mothur
+mothur_libshuff	mothur
+mothur_metastats	mothur
+mothur_get_rabund	mothur
+mothur_get_otus	mothur
+mothur_otu_hierarchy	mothur
+mothur_trim_flows	mothur
+mothur_cluster_fragments	mothur
+mothur_rarefaction_shared	mothur
+mothur_classify_seqs	mothur
+mothur_phylotype	mothur
+mothur_unifrac_unweighted	mothur
+mothur_tree_shared	mothur
+mothur_get_otulabels	mothur
+mothur_count_seqs	mothur
+mothur_consensus_seqs	mothur
+mothur_collect_shared	mothur
+mothur_corr_axes	mothur
+mothur_summary_seqs	mothur
+mothur_anosim	mothur
+mothur_remove_seqs	mothur
+mothur_get_communitytype	mothur
+mothur_cluster_split	mothur
+mothur_summary_tax	mothur
+mothur_fastq_info	mothur
+mothur_unifrac_weighted	mothur
+mothur_get_seqs	mothur
+mothur_bin_seqs	mothur
+mothur_degap_seqs	mothur
+mothur_chimera_ccode	mothur
+mothur_primer_design	mothur
+mothur_seq_error	mothur
+mothur_remove_groups	mothur
+mothur_mantel	mothur
+mothur_lefse	mothur
+mothur_heatmap_bin	mothur
+mothur_clearcut	mothur
+mothur_get_sharedseqs	mothur
+mothur_chimera_bellerophon	mothur
+mothur_cluster	mothur
+mothur_sens_spec	mothur
+mothur_make_shared	mothur
+mothur_chimera_slayer	mothur
+mothur_remove_lineage	mothur
+mothur_reverse_seqs	mothur
+mothur_dist_shared	mothur
+mothur_shhh_flows	mothur
+mothur_get_lineage	mothur
+mothur_merge_taxsummary	mothur
+mothur_hcluster	mothur
+mothur_make_lookup	mothur
+mothur_remove_rare	mothur
+mothur_collect_single	mothur
+mothur_rarefaction_single	mothur
+mothur_get_groups	mothur
+mothur_chimera_check	mothur
+mothur_heatmap_sim	mothur
+mothur_get_relabund	mothur
+mothur_make_biom	mothur
+mothur_classify_otu	mothur
+mothur_merge_sfffiles	mothur
+mothur_summary_qual	mothur
+mothur_venn	mothur
+mothur_list_seqs	mothur
+mothur_homova	mothur
+mothur_pca	mothur
+mothur_remove_otus	mothur
+mothur_parsimony	mothur
+mothur_shhh_seqs	mothur
+mothur_get_oturep	mothur
+mothur_count_groups	mothur
+mothur_get_mimarkspackage	mothur
+mothur_normalize_shared	mothur
+mothur_indicator	mothur
+mothur_get_coremicrobiome	mothur
+mothur_chimera_uchime	mothur
+obi_stat	obitools
+obi_sort	obitools
+obi_convert	obitools
+obi_clean	obitools
+obi_uniq	obitools
+obi_grep	obitools
+obi_annotate	obitools
+obi_illumina_pairend	obitools
+obi_ngsfilter	obitools
+obi_tab	obitools
+ivar_trim	ivar
+ivar_removereads	ivar
+ivar_variants	ivar
+ivar_filtervariants	ivar
+ivar_consensus	ivar
+ivar_getmasked	ivar
+cardinal_colocalization	cardinal
+eggnog_mapper	eggnog-mapper-v2
+proteinortho_summary	proteinortho
+OpenPepXL	openms
+XFDR	openms
+PercolatorAdapter	openms
+maxquant_mqpar	maxquant
+proteinortho	proteinortho
+cardinal_combine	cardinal
+cardinal_spectra_plots	cardinal
+cardinal_preprocessing	cardinal
+cardinal_quality_report	cardinal
+cardinal_mz_images	cardinal
+cardinal_data_exporter	cardinal
+cardinal_segmentations	cardinal
+cardinal_filtering	cardinal
+msstats	msstats
+msstatstmt	msstats
+maxquant	maxquant
+cardinal_classification	cardinal
+metaquantome_viz	metaQuantome
+metaquantome_stat	metaQuantome
+metaquantome_expand	metaQuantome
+encyclopedia_fasta_to_prosit_csv	encylopeDIA
+encyclopedia_quantify	encylopeDIA
+encyclopedia_walnut	encylopeDIA
+encyclopedia_searchtolib	encylopeDIA
+encyclopedia_library_to_blib	encylopeDIA
+pepquery	pepQuery
+ConsensusID	openms
+myrimatch	encyclopeDIA
+encyclopedia_encyclopedia	encyclopeDIA
+metaquantome_db	metaQuantome
+maxquant_mqpar	maxquant
+metaquantome_filter	metaQuantome
+proteinortho_grab_proteins	proteinortho
+cardinal_single_ion_segmentation	cardinal
+PSMFeatureExtractor	openms
+NovorAdapter	openms
+LuciphorAdapter	openms
+AssayGeneratorMetabo	openms
+SiriusAdapter	openms
+MSFraggerAdapter	openms
+MSGFPlusAdapter	openms
+PeakPickerHiRes	openms
+RNAMassCalculator	openms
+QualityControl	openms
+RNPxlXICFilter	openms
+OpenSwathConfidenceScoring	openms
+MultiplexResolver	openms
+OpenSwathFeatureXMLToTSV	openms
+OpenSwathDIAPreScoring	openms
+MapStatistics	openms
+DigestorMotif	openms
+FeatureLinkerLabeled	openms
+XTandemAdapter	openms
+SpectraFilterWindowMower	openms
+OpenSwathWorkflow	openms
+QCMerger	openms
+IDMapper	openms
+IDMassAccuracy	openms
+IDRTCalibration	openms
+IDSplitter	openms
+MRMTransitionGroupPicker	openms
+MapAlignerIdentification	openms
+IsobaricAnalyzer	openms
+ERPairFinder	openms
+ClusterMassTraces	openms
+ClusterMassTracesByPrecursor	openms
+CometAdapter	openms
+CompNovo	openms
+CompNovoCID	openms
+IDMerger	openms
+MetaboliteSpectralMatcher	openms
+RTEvaluation	openms
+QCExporter	openms
+SpectraFilterNormalizer	openms
+InternalCalibration	openms
+MassTraceExtractor	openms
+PepNovoAdapter	openms
+Digestor	openms
+PeptideIndexer	openms
+MapRTTransformer	openms
+OpenSwathAssayGenerator	openms
+DTAExtractor	openms
+SequenceCoverageCalculator	openms
+MetaProSIP	openms
+IDConflictResolver	openms
+PeakPickerWavelet	openms
+ProteinQuantifier	openms
+PeakPickerIterative	openms
+Decharger	openms
+FuzzyDiff	openms
+MzMLSplitter	openms
+FileConverter	openms
+MassCalculator	openms
+SpectraFilterNLargest	openms
+MapAlignerPoseClustering	openms
+QCEmbedder	openms
+Epifany	openms
+SpectraFilterThresholdMower	openms
+SpectraMerger	openms
+OpenSwathDecoyGenerator	openms
+PTModel	openms
+TargetedFileConverter	openms
+TextExporter	openms
+TOFCalibration	openms
+TransformationEvaluation	openms
+XMLValidator	openms
+ProteinInference	openms
+SvmTheoreticalSpectrumGeneratorTrainer	openms
+IDRipper	openms
+SpectraSTSearchAdapter	openms
+SpectraFilterSqrtMower	openms
+SpectraFilterMarkerMower	openms
+SpecLibSearcher	openms
+MascotAdapterOnline	openms
+MapAlignerSpectrum	openms
+SpecLibCreator	openms
+SemanticValidator	openms
+SimpleSearchEngine	openms
+LabeledEval	openms
+SeedListGenerator	openms
+RTModel	openms
+MaRaClusterAdapter	openms
+RNPxlSearch	openms
+PrecursorIonSelector	openms
+FeatureFinderCentroided	openms
+SpectraFilterParentPeakMower	openms
+TICCalculator	openms
+MRMMapper	openms
+OMSSAAdapter	openms
+EICExtractor	openms
+MyriMatchAdapter	openms
+IDFilter	openms
+MSSimulator	openms
+BaselineFilter	openms
+NucleicAcidSearchEngine	openms
+SpectraFilterBernNorm	openms
+CVInspector	openms
+RNADigestor	openms
+DecoyDatabase	openms
+ExternalCalibration	openms
+FalseDiscoveryRate	openms
+FeatureFinderIdentification	openms
+FeatureFinderIsotopeWavelet	openms
+FeatureFinderMetabo	openms
+FeatureFinderMetaboIdent	openms
+FeatureFinderMRM	openms
+FeatureFinderMultiplex	openms
+FeatureLinkerUnlabeled	openms
+FeatureLinkerUnlabeledKD	openms
+FeatureLinkerUnlabeledQT	openms
+FFEval	openms
+FidoAdapter	openms
+FileFilter	openms
+FileInfo	openms
+FileMerger	openms
+GNPSExport	openms
+AccurateMassSearch	openms
+DatabaseFilter	openms
+DeMeanderize	openms
+FeatureFinderSuperHirn	openms
+OpenSwathMzMLFileCacher	openms
+OpenSwathRewriteToFeatureXML	openms
+IDPosteriorErrorProbability	openms
+IDFileConverter	openms
+IDScoreSwitcher	openms
+MapAlignerTreeGuided	openms
+MapNormalizer	openms
+MascotAdapter	openms
+MetaboliteAdductDecharger	openms
+MRMPairFinder	openms
+MSstatsConverter	openms
+MzTabExporter	openms
+NoiseFilterGaussian	openms
+NoiseFilterSGolay	openms
+OpenPepXLLF	openms
+OpenSwathChromatogramExtractor	openms
+OpenSwathAnalyzer	openms
+OpenSwathFileSplitter	openms
+OpenSwathRTNormalizer	openms
+PhosphoScoring	openms
+HighResPrecursorMassCorrector	openms
+PrecursorMassCorrector	openms
+QCCalculator	openms
+CruxAdapter	openms
+ConsensusMapNormalizer	openms
+QCImporter	openms
+SpectraFilterScaler	openms
+QCShrinker	openms
+QCExtractor	openms
+ProteinResolver	openms
+IDExtractor	openms
+LowMemPeakPickerHiRes	openms
+LowMemPeakPickerHiResRandomAccess	openms
+proteomics_moff	moff
+unipept	unipept
+maldi_quant_peak_detection	maldi_quant
+diapysef	diapasef
+flashlfq	flashlfq
+reactome_pathwaymatcher	PathwayMatcher
+rawtools	rawtools
+dia_umpire_se	DIA-Umpire
+custom_pro_db	customprodb
+maldi_quant_preprocessing	maldi_quant
+megahit_contig2fastg	megahit
+percolator_input_converters	percolator
+percolator	percolator
+pout2mzid	percolator
+batched_set_list_creator	percolator
+msgfplus	msgfplus
+RTPredict	openms
+PTPredict	openms
+InspectAdapter	openms
+InclusionExclusionListCreator	openms
+LowMemPeakPickerHiRes_RandomAccess	openms
+IDDecoyProbability	openms
+RNPxl	openms
+AdditiveSeries	openms
+TopPerc	openms
+RTPredict	openms
+PTPredict	openms
+morpheus	morpheus
+metams_runGC	metams
+InspectAdapter	openms
+abims_xcms_refine	xcms
+InclusionExclusionListCreator	openms
+LowMemPeakPickerHiRes_RandomAccess	openms
+IDDecoyProbability	openms
+RNPxl	openms
+metfrag_vis	metfrag
+w4mcorcov	ropls
+AdditiveSeries	openms
+TopPerc	openms
+morpheus	morpheus
+sirius_csifingerid	sirius
+metfrag	metfrag
+mspurity_spectralmatching	mspurity
+mspurity_purityx	mspurity
+mspurity_dimspredictpuritysingle	mspurity
+metams_runGC	metams
+mspurity_createmsp	mspurity
+mspurity_createdatabase	mspurity
+mspurity_averagefragspectra	mspurity
+mspurity_filterfragspectra	mspurity
+mspurity_frag4feature	mspurity
+mspurity_puritya	mspurity
+mspurity_flagremove	mspurity
+isoplot	xcms
+abims_xcms_refine	xcms
+NmrAnnotation	asics
+w4mclassfilter	workflow4metabolomics
+asca	metstat
+wsdl_hmdb	hmdb
+golm_ws_lib_search	gmd
+abims_xcms_summary	xcms
+abims_CAMERA_annotateDiffreport	camera
+abims_xcms_fillPeaks	xcms
+abims_xcms_retcor	xcms
+abims_xcms_group	xcms
+xcms_merge	xcms
+xcms_plot_chromatogram	xcms
+abims_xcms_xcmsSet	xcms
+msnbase_readmsdata	msnbase
+sirius_csifingerid	sirius
+metfrag	metfrag
+mspurity_spectralmatching	mspurity
+mspurity_purityx	mspurity
+mixomics_multilevel	mixomics
+mspurity_dimspredictpuritysingle	mspurity
+dimspy_merge_peaklists	mspurity
+mspurity_createmsp	mspurity
+massbank_ws_searchspectrum	massbank
+Probmetab	probmetab
+abims_CAMERA_combinexsAnnos	camera
+profia	profia
+mspurity_createdatabase	mspurity
+mspurity_averagefragspectra	mspurity
+NmrAlignment	speaq
+gmx_energy	gromacs
+gmx_get_builtin_file	gromacs
+gmx_rg	gromacs
+gmx_makendx	gromacs
+gmx_restraints	gromacs
+gmx_trj	gromacs
+gmx_sim	gromacs
+gmx_solvate	gromacs
+gmx_em	gromacs
+gmx_setup	gromacs
+gromacs_extract_topology	gromacs
+tleap	ambertools
+rdconf	RDKit
+mspurity_filterfragspectra	mspurity
+docking	autodock
+ctb_rdkit_descriptors	RDKit
+acpype_Amber2Gromacs	gromacs
+parmconv	ambertools
+ambertools_acpype	ambertools
+gmx_merge_topology_files	gromacs
+mspurity_frag4feature	mspurity
+mspurity_puritya	mspurity
+mspurity_flagremove	mspurity
+genform	workflow4metabolomics
+NmrAnnotation	workflow4metabolomics
+xcms_export_samplemetadata	xcms
+tablemerge	workflow4metabolomics
+intens_check	workflow4metabolomics
+idchoice	workflow4metabolomics
+normalization	workflow4metabolomics
+mixmodel	workflow4metabolomics
+asca	workflow4metabolomics
+corrtable	workflow4metabolomics
+wsdl_hmdb	workflow4metabolomics
+bank_inhouse	workflow4metabolomics
+lcmsmatching	workflow4metabolomics
+golm_ws_lib_search	workflow4metabolomics
+NMR_Preprocessing	workflow4metabolomics
+NMR_Read	workflow4metabolomics
+abims_xcms_summary	workflow4metabolomics
+abims_CAMERA_annotateDiffreport	workflow4metabolomics
+abims_xcms_fillPeaks	xcms
+abims_xcms_retcor	xcms
+abims_xcms_group	xcms
+xcms_merge	xcms
+xcms_plot_chromatogram	xcms
+abims_xcms_xcmsSet	xcms
+msnbase_readmsdata	workflow4metabolomics
+lipidmaps	workflow4metabolomics
+w4mjoinpn	workflow4metabolomics
+generic_filter	workflow4metabolomics
+quality_metrics	workflow4metabolomics
+mixomics_multilevel	workflow4metabolomics
+checkFormat	workflow4metabolomics
+Determine_BC	workflow4metabolomics
+Batch_correction	workflow4metabolomics
+massbank_ws_searchspectrum	workflow4metabolomics
+Probmetab	workflow4metabolomics
+abims_CAMERA_combinexsAnnos	workflow4metabolomics
+profia	workflow4metabolomics
+NmrBucketing	workflow4metabolomics
+NmrNormalization	workflow4metabolomics
+NmrAlignment	workflow4metabolomics
+gmx_energy	gromacs
+gmx_get_builtin_file	gromacs
+gmx_rg	gromacs
+gmx_makendx	gromacs
+gmx_restraints	gromacs
+gmx_trj	gromacs
+gmx_sim	gromacs
+gmx_solvate	gromacs
+gmx_em	gromacs
+gmx_setup	gromacs
+gromacs_extract_topology	gromacs
+tleap	ambertools
+rdconf	RDKit
+docking	autodock_vina
+ctb_rdkit_descriptors	RDKit
+acpype_Amber2Gromacs	ambertools
+parmconv	ambertools
+ambertools_acpype	ambertools
+gmx_merge_topology_files	gromacs
+ambertools_parmchk2	ambertools
+ambertools_antechamber	ambertools
+mmpbsa_mmgbsa	ambertools
+dpocket	fpocket
+OpenPepXL	openms
+fpocket	fpocket
+prepare_box	autodock_vina
+gmx_md	gromacs
+sucos_docking_scoring	SuCOS
+chembl	chembl
+chembl_structure_pipeline	chembl
+gmx_editconf	gromacs
+openbabel_subsearch	open_babel
+mdanalysis_extract_rmsd	mdanalysis
+openbabel_addh	open_babel
+openbabel_remIons	open_babel
+chembl_structure_pipeline	chembl
+gromacs_modify_topology	gromacs
+openbabel_remove_protonation_state	open_babel
+mdanalysis_ramachandran_protein	mdanalysis
+mdanalysis_endtoend	mdanalysis
+mdanalysis_cosine_analysis	mdanalysis
+mdanalysis_hbonds	mdanalysis
+mdanalysis_ramachandran_plot	mdanalysis
+mdanalysis_distance	mdanalysis
+mdanalysis_dihedral	mdanalysis
+openbabel_change_title	open_babel
+mdanalysis_rdf	mdanalysis
+openbabel_spectrophore_search	open_babel
+mdanalysis_angle	mdanalysis
+prepare_receptor	autodock_vina
+enumerate_charges	RDKit
+sdf_to_tab	RDKit
+ctb_mordred_descriptors	mordred
+ctb_pubchem_download_as_smiles	pubchem
+ctb_pubchem_download_assays	pubchem
+prepare_ligand	autodock_vina
+openbabel_remDuplicates	open_babel
+openbabel_filter	open_babel
+openbabel_compound_convert	open_babel
+openbabel_svg_depiction	open_babel
+openbabel_genProp	open_babel
+openbabel_obgrep	open_babel
+openbabel_remSmall	open_babel
+prepare_ligands_for_docking	open_babel
+sucos_clustering	SuCOS
+sucos_max_score	SuCOS
+openbabel_structure_distance_finder	open_babel
+ctb_chemfp_mol2fps	chemfp
+ctb_chemfp_nxn_clustering	chemfp
+ctb_chemfp_butina_clustering	chemfp
+ctb_sdf2fps	chemfp
+goseq	goseq
+bio3d_pca_visualize	bio3d
+bio3d_rmsf	bio3d
+bio3d_pca	bio3d
+bio3d_rmsd	bio3d
+bio3d_dccm	bio3d
+packmol	PACKMOL-Memgen
+get_pdb	pdb
+openbabel_multi_obgrep	open_babel
+ctb_remIons	open_babel
+ctb_subsearch	open_babel
+ctb_multi_obgrep	open_babel
+ctb_spectrophore_search	open_babel
+ctb_confab	open_babel
+ctb_online_data_fetch	chemicaltoolbox
+ctb_pubchem_download_assays	chemicaltoolbox
+ctb_openmg	chemicaltoolbox
+ip_landmark_registration	galaxy_image_analysis
+plotly_regression_performance_plots	scikit-learn
+plotly_ml_performance_plots	scikit-learn
+nn_classifier	scikit-learn
+svm_classifier	scikit-learn
+abims_anova	workflow4metabolomics
+Multivariate	workflow4metabolomics
+Univariate	workflow4metabolomics
+iwtomics_plotwithscale	iwtomics
+iwtomics_testandplot	iwtomics
+iwtomics_loadandplot	iwtomics
+biosigner	workflow4metabolomics
+Transformation	workflow4metabolomics
+Heatmap	workflow4metabolomics
+sklearn_to_categorical	scikit-learn
+ml_visualization_ex	scikit-learn
+sklearn_lightgbm	scikit-learn
+sklearn_train_test_split	scikit-learn
+sklearn_model_fit	scikit-learn
+sklearn_stacking_ensemble_models	scikit-learn
+sklearn_estimator_attributes	scikit-learn
+model_prediction	scikit-learn
+sklearn_train_test_eval	scikit-learn
+sklearn_model_validation	scikit-learn
+sklearn_discriminant_classifier	scikit-learn
+sklearn_regression_metrics	scikit-learn
+sklearn_feature_selection	scikit-learn
+sklearn_numeric_clustering	scikit-learn
+sklearn_nn_classifier	scikit-learn
+sklearn_build_pipeline	scikit-learn
+sklearn_searchcv	scikit-learn
+sklearn_sample_generator	scikit-learn
+sklearn_svm_classifier	scikit-learn
+sklearn_pairwise_metrics	scikit-learn
+sklearn_ensemble	scikit-learn
+sklearn_data_preprocess	scikit-learn
+sklearn_clf_metrics	scikit-learn
+sklearn_generalized_linear	scikit-learn
+sklearn_fitted_model_eval	scikit-learn
+sklearn_pca	scikit-learn
+keras_train_and_eval	scikit-learn
+keras_batch_models	scikit-learn
+keras_model_builder	scikit-learn
+keras_model_config	scikit-learn
+ggplot2_heatmap2	ggplot2
+pygenomeTracks	pygenometracks
+circos_aln_to_links	circos
+circos_binlinks	circos
+circos_bundlelinks	circos
+circos_gc_skew	circos
+circos_resample	circos
+circos_wiggle_to_scatter	circos
+circos_wiggle_to_stacked	circos
+circos_tableviewer	circos
+circos_interval_to_text	circos
+circos_interval_to_tile	circos
+intervene_pairwise	intervene
+intervene_upset	intervene
+jbrowse_to_standalone	jbrowse
+pe_histogram	seqcode
+build_ucsc_custom_track_1	UCSC_Genome_Browser_Utilities
+jvarkit_wgscoverageplotter	jvarkit
+newick_display	newick_utilities
+taxonomy_krona_chart	taxonomy_krona_chart
+export2graphlan	graphlan
+plotly_regression_performance_plots	scikit-learn
+graphlan	graphlan
+graphlan_annotate	graphlan
+krona-text	krona
+mummerplot_wrapper	mummer
+codeml	paml
+iqtree	iqtree
+rapidnj	rapidnj
+meme_chip	meme
+meme_psp_gen	meme
+meme_dreme	meme
+chipeakanno_annopeaks	chippeakanno
+clusterprofiler_bitr	clusterprofiler
+clusterprofiler_go	clusterprofiler
+fasttree	fasttree
+gd_raxml	raxml
+raxml	raxml
+fetch_jbrowse	apollo-seq
+feat_from_gff3	apollo-seq
+export	apollo-seq
+iframe	apollo-seq
+create_or_update	apollo-seq
+delete_organism	apollo-seq
+create_account	apollo-seq
+list_organism	apollo-seq
+delete_features	apollo-seq
+ip_projective_transformation	scikit-image
+ip_image_registration	scikit-image
+ip_overlay_images	scikit-image
+ip_landmark_registration_ls	scikit-image
+ip_localthreshold	scikit-image
+ip_threshold	scikit-image
+ip_projective_transformation_points	scikit-image
+ip_spot_detection_2d	scikit-image
+ip_points_association_nn	scikit-image
+ip_curve_fitting	scikit-image
+cp_cellprofiler	CellProfiler
+cp_common	CellProfiler
+cp_color_to_gray	CellProfiler
+cp_tile	CellProfiler
+cp_track_objects	CellProfiler
+ip_landmark_registration	CellProfiler
+cp_overlay_outlines	CellProfiler
+cp_convert_objects_to_image	CellProfiler
+cp_display_data_on_image	CellProfiler
+cp_enhance_or_suppress_features	CellProfiler
+cp_export_to_spreadsheet	CellProfiler
+cp_gray_to_color	CellProfiler
+cp_identify_primary_objects	CellProfiler
+cp_mask_image	CellProfiler
+cp_measure_granularity	CellProfiler
+cp_measure_image_area_occupied	CellProfiler
+cp_measure_image_intensity	CellProfiler
+cp_measure_image_quality	CellProfiler
+cp_measure_object_intensity	CellProfiler
+cp_measure_object_size_shape	CellProfiler
+cp_measure_texture	CellProfiler
+cp_relate_objects	CellProfiler
+cp_save_images	CellProfiler
+cp_image_math	CellProfiler
+imagej2_binary_to_edm	imagej
+imagej2_skeletonize3d	imagej
+imagej2_find_edges	imagej
+imagej2_shadows	imagej
+imagej2_enhance_contrast	imagej
+imagej2_find_maxima	imagej
+imagej2_watershed_binary	imagej
+imagej2_bunwarpj_raw_transform	imagej
+imagej2_math	imagej
+imagej2_bunwarpj_elastic_transform	imagej
+ip_viz_overlay_moving_and_fixed_image	scikit-image
+ip_wsi_extract_top_view	scikit-image
+imagej2_bunwarpj_adapt_transform	imagej
+imagej2_adjust_threshold_binary	imagej
+imagej2_bunwarpj_compose_elastic	imagej
+imagej2_sharpen	imagej
+imagej2_make_binary	imagej
+imagej2_bunwarpj_convert_to_raw	imagej
+imagej2_bunwarpj_compare_raw	imagej
+imagej2_bunwarpj_compare_elastic	imagej
+imagej2_analyze_skeleton	imagej
+imagej2_smooth	imagej
+imagej2_bunwarpj_align	imagej
+imagej2_bunwarpj_compose_raw	imagej
+imagej2_noise	imagej
+imagej2_create_image	imagej
+imagej2_analyze_particles_binary	imagej
+imagej2_bunwarpj_compose_raw_elastic	imagej
+imagej2_bunwarpj_compare_elastic_raw	imagej
+ip_detection_viz	scikit-image
+ip_histogram_equalization	scikit-image
+ip_colocalization	scikit-image
+ip_2d_feature_extraction	scikit-image
+ip_permutate_axis	scikit-image
+ip_labelimage_to_points	scikit-image
+ip_points_to_label	scikit-image
+ip_concat_channels	scikit-image
+ip_scale_image	scikit-image
+ip_merge_neighbours_in_label	scikit-image
+ip_binary_to_labelimage	scikit-image
+ip_2d_filter_segmentation_by_features	scikit-image
+ip_2d_split_binaryimage_by_watershed	scikit-image
+ip_anisotropic_diffusion	scikit-image
+ip_color_deconvolution	scikit-image
+ip_filter_standard	galaxy_image_analysis
+ip_points_to_labe	galaxy_image_analysis
+imagecoordinates_flipaxis	galaxy_image_analysis
+ip_coordinates_of_roi	galaxy_image_analysis
+ip_count_objects	galaxy_image_analysis
+ip_mahotas_features	galaxy_image_analysis
+ip_overlay_segmentation	galaxy_image_analysis
+ip_points_to_binaryimage	galaxy_image_analysis
+ip_visceral_evaluatesegmentation	galaxy_image_analysis
+ip_binaryimage_to_points	galaxy_image_analysis
+ip_slice_image	galaxy_image_analysis
+ip_split_labelmap	galaxy_image_analysis
+onto_tk_get_ancestor_terms	onto-tools
+onto_tk_get_relationship_types	onto-tools
+onto_tk_obo2rdf	onto-tools
+onto_tk_get_parent_terms	onto-tools
+onto_tk_get_parent_terms_by_relationship_type	onto-tools
+onto_tk_get_terms	onto-tools
+onto_tk_obo2owl	onto-tools
+onto_tk_get_relationship_id_vs_relationship_namespace	onto-tools
+onto_tk_get_term_synonyms	onto-tools
+onto_tk_get_descendent_terms	onto-tools
+onto_tk_term_id_vs_term_name	onto-tools
+onto_tk_get_child_terms	onto-tools
+onto_tk_get_subontology_from	onto-tools
+onto_tk_get_relationship_id_vs_relationship_def	onto-tools
+onto_tk_get_terms_by_relationship_type	onto-tools
+onto_tk_get_root_terms	onto-tools
+onto_tk_get_relationship_id_vs_relationship_name	onto-tools
+ucsc_cell_browser	ucsc_genome_browser
+scanpy_find_markers	scanpy
+scanpy_scale_data	scanpy
+scanpy_run_umap	scanpy
+scanpy_run_tsne	scanpy
+scanpy_run_pca	scanpy
+scanpy_read_10x	scanpy
+scanpy_normalise_data	scanpy
+scanpy_find_variable_genes	scanpy
+scanpy_find_cluster	scanpy
+scanpy_filter_genes	scanpy
+scanpy_filter_cells	scanpy
+scanpy_compute_graph	scanpy
+scanpy_parameter_iterator	scanpy
+scanpy_plot_trajectory	scanpy
+scmap_index_cell	scmap
+sam_merge2	picard_tools
+sam_pileup	samtools
+samtools_flagstat	samtools
+samtools_mpileup	samtools
+samtools_rmdup	samtools
+samtools_slice_bam	samtools
+gatk_count_covariates	gatk
+spring_model	spring
+spring_minz	spring
+spring_cross	spring
+pubmed_by_queries	pubmed, simtext
+text_to_wordmatrix	pubmed, simtext
+abstracts_by_pmids	pubmed, simtext
+pmids_to_pubtator_matrix	pubmed, simtext
+spring_model_all	spring
+spring_map	spring
+spring_mcc	spring
+length_and_gc_content	r
+malt_run	malt
+maaslin2	MaAsLin 2
+Kraken2Tax	kraken2tax
+instrain_profile	inStrain
+humann_strain_profiler	humann3
+humann_split_stratified_table	humann3
+humann_rename_table	humann3
+humann_join_tables	humann3
+humann_associate	humann3
+humann_regroup_table	humann3
+humann	humann3
+humann_split_table	humann3
+humann_renorm_table	humann3
+humann_barplot	humann3
+bio_hansel	bio_hansel
+staramr_search	staramr
+humann_reduce_table	humann3
+humann_rna_dna_norm	humann3
+humann_unpack_pathways	humann3
 # testing tool mapping for test case
-cheetah_problem_unbound_var_input	bwa
\ No newline at end of file
+cheetah_problem_unbound_var_input	bwa
diff --git a/lib/galaxy/tool_util/parser/interface.py b/lib/galaxy/tool_util/parser/interface.py
index 390c59e84da..5b4a26d03ec 100644
--- a/lib/galaxy/tool_util/parser/interface.py
+++ b/lib/galaxy/tool_util/parser/interface.py
@@ -23,29 +23,34 @@ from .util import _parse_name
 
 NOT_IMPLEMENTED_MESSAGE = "Galaxy tool format does not yet support this tool feature."
 
-AssertionDict = TypedDict(
-    "AssertionDict", {"tag": str, "attributes": Dict[str, Any], "children": Optional[List[Dict[str, Any]]]}
-)
+
+class AssertionDict(TypedDict):
+    tag: str
+    attributes: Dict[str, Any]
+    children: Optional[List[Dict[str, Any]]]
+
+
 AssertionList = Optional[List[AssertionDict]]
 XmlInt = Union[str, int]
-ToolSourceTest = TypedDict(
-    "ToolSourceTest",
-    {
-        "inputs": Any,
-        "outputs": Any,
-        "output_collections": List[Any],
-        "stdout": AssertionList,
-        "stderr": AssertionList,
-        "expect_exit_code": Optional[XmlInt],
-        "expect_failure": bool,
-        "expect_test_failure": bool,
-        "maxseconds": Optional[XmlInt],
-        "expect_num_outputs": Optional[XmlInt],
-        "command": AssertionList,
-        "command_version": AssertionList,
-    },
-)
-ToolSourceTests = TypedDict("ToolSourceTests", {"tests": List[ToolSourceTest]})
+
+
+class ToolSourceTest(TypedDict):
+    inputs: Any
+    outputs: Any
+    output_collections: List[Any]
+    stdout: AssertionList
+    stderr: AssertionList
+    expect_exit_code: Optional[XmlInt]
+    expect_failure: bool
+    expect_test_failure: bool
+    maxseconds: Optional[XmlInt]
+    expect_num_outputs: Optional[XmlInt]
+    command: AssertionList
+    command_version: AssertionList
+
+
+class ToolSourceTests(TypedDict):
+    tests: List[ToolSourceTest]
 
 
 class ToolSource(metaclass=ABCMeta):
diff --git a/lib/galaxy/tool_util/parser/xml.py b/lib/galaxy/tool_util/parser/xml.py
index 1c601308722..b2c4180cadd 100644
--- a/lib/galaxy/tool_util/parser/xml.py
+++ b/lib/galaxy/tool_util/parser/xml.py
@@ -16,6 +16,7 @@ from galaxy.tool_util.parser.util import (
     DEFAULT_DELTA_FRAC,
 )
 from galaxy.util import (
+    Element,
     ElementTree,
     string_as_bool,
     xml_text,
@@ -56,6 +57,7 @@ class XmlToolSource(ToolSource):
     """Responsible for parsing a tool from classic Galaxy representation."""
 
     language = "xml"
+    root: Element
 
     def __init__(self, xml_tree: ElementTree, source_path=None, macro_paths=None):
         self.xml_tree = xml_tree
diff --git a/lib/galaxy/tool_util/provided_metadata.py b/lib/galaxy/tool_util/provided_metadata.py
index 67854501dde..48df3f6287e 100644
--- a/lib/galaxy/tool_util/provided_metadata.py
+++ b/lib/galaxy/tool_util/provided_metadata.py
@@ -167,7 +167,7 @@ class LegacyToolProvidedMetadata(BaseToolProvidedMetadata):
         return []
 
     def rewrite(self):
-        with open(self.meta_file, "wt") as job_metadata_fh:
+        with open(self.meta_file, "w") as job_metadata_fh:
             for meta in self.tool_provided_job_metadata:
                 job_metadata_fh.write(f"{json.dumps(meta)}\n")
 
@@ -230,5 +230,5 @@ class ToolProvidedMetadata(BaseToolProvidedMetadata):
         return self.tool_provided_job_metadata.get("__unnamed_outputs", [])
 
     def rewrite(self):
-        with open(self.meta_file, "wt") as job_metadata_fh:
+        with open(self.meta_file, "w") as job_metadata_fh:
             json.dump(self.tool_provided_job_metadata, job_metadata_fh)
diff --git a/lib/galaxy/tool_util/verify/__init__.py b/lib/galaxy/tool_util/verify/__init__.py
index f75cf8d6ff4..ad0a39a8d7f 100644
--- a/lib/galaxy/tool_util/verify/__init__.py
+++ b/lib/galaxy/tool_util/verify/__init__.py
@@ -370,6 +370,7 @@ def files_re_match(file1, file2, attributes=None):
     )
     if attributes.get("sort", False):
         history_data.sort()
+        local_file.sort()
     lines_diff = int(attributes.get("lines_diff", 0))
     line_diff_count = 0
     diffs = []
diff --git a/lib/galaxy/tool_util/verify/asserts/archive.py b/lib/galaxy/tool_util/verify/asserts/archive.py
index a65bb814df3..ae00a36168e 100644
--- a/lib/galaxy/tool_util/verify/asserts/archive.py
+++ b/lib/galaxy/tool_util/verify/asserts/archive.py
@@ -17,7 +17,9 @@ def _extract_from_tar(bytes, fn):
             # so make this consistent for tar
             if ti.isdir():
                 return ""
-            with tar_temp.extractfile(fn) as member_fh:
+            tar_file = tar_temp.extractfile(fn)
+            assert tar_file is not None
+            with tar_file as member_fh:
                 return member_fh.read()
 
 
diff --git a/lib/galaxy/tool_util/verify/asserts/text.py b/lib/galaxy/tool_util/verify/asserts/text.py
index a29a88bb336..1d6244ad13a 100644
--- a/lib/galaxy/tool_util/verify/asserts/text.py
+++ b/lib/galaxy/tool_util/verify/asserts/text.py
@@ -64,8 +64,8 @@ def assert_has_line(
         min,
         max,
         negate,
-        lambda o, l: re.search(f"^{re.escape(l)}$", o, flags=re.MULTILINE) is not None,
-        lambda o, l: len(re.findall(f"^{re.escape(l)}$", o, flags=re.MULTILINE)),
+        lambda o, t: re.search(f"^{re.escape(t)}$", o, flags=re.MULTILINE) is not None,
+        lambda o, t: len(re.findall(f"^{re.escape(t)}$", o, flags=re.MULTILINE)),
         "{expected} line '{text}' in output ('{output}')",
         "{expected} {n}+-{delta} lines '{text}' in output ('{output}')",
         "{expected} that the number of lines '{text}' in output is in [{min}:{max}] ('{output}')",
diff --git a/lib/galaxy/tool_util/verify/interactor.py b/lib/galaxy/tool_util/verify/interactor.py
index 96c385a555d..cce0db74cfb 100644
--- a/lib/galaxy/tool_util/verify/interactor.py
+++ b/lib/galaxy/tool_util/verify/interactor.py
@@ -15,11 +15,13 @@ from logging import getLogger
 from typing import (
     Any,
     Callable,
+    cast,
     Dict,
     Generator,
     List,
     NamedTuple,
     Optional,
+    Union,
 )
 
 import requests
@@ -29,10 +31,16 @@ from packaging.version import (
 )
 from requests import Response
 from requests.cookies import RequestsCookieJar
-from typing_extensions import Protocol
+from typing_extensions import (
+    Literal,
+    NotRequired,
+    Protocol,
+    TypedDict,
+)
 
 from galaxy import util
 from galaxy.tool_util.parser.interface import (
+    AssertionList,
     TestCollectionDef,
     TestCollectionOutputDef,
 )
@@ -78,8 +86,42 @@ class OutputsDict(dict):
 
 JobDataT = Dict[str, Any]
 JobDataCallbackT = Callable[[JobDataT], None]
-ToolTestDictT = Dict[str, Any]
-ToolTestDictsT = List[ToolTestDictT]
+
+
+class ValidToolTestDict(TypedDict):
+    inputs: Any
+    outputs: Any
+    output_collections: List[Dict[str, Any]]
+    stdout: NotRequired[AssertionList]
+    stderr: NotRequired[AssertionList]
+    expect_exit_code: NotRequired[int]
+    expect_failure: NotRequired[bool]
+    expect_test_failure: NotRequired[bool]
+    maxseconds: NotRequired[int]
+    num_outputs: NotRequired[int]
+    command_line: NotRequired[AssertionList]
+    command_version: NotRequired[AssertionList]
+    required_files: NotRequired[List[Any]]
+    required_data_tables: NotRequired[List[Any]]
+    required_loc_files: NotRequired[List[str]]
+    error: Literal[False]
+    tool_id: str
+    tool_version: str
+    test_index: int
+
+
+class InvalidToolTestDict(TypedDict):
+    error: Literal[True]
+    tool_id: str
+    tool_version: str
+    test_index: int
+    inputs: Any
+    exception: str
+    maxseconds: Optional[int]
+
+
+ToolTestDict = Union[ValidToolTestDict, InvalidToolTestDict]
+ToolTestDictsT = List[ToolTestDict]
 
 
 def stage_data_in_history(
@@ -1228,16 +1270,16 @@ def verify_tool(
     publish_history: bool = False,
     force_path_paste: bool = False,
     maxseconds: int = DEFAULT_TOOL_TEST_WAIT,
-    tool_test_dicts: Optional[ToolTestDictsT] = None,
     client_test_config: Optional[TestConfig] = None,
     skip_with_reference_data: bool = False,
     skip_on_dynamic_param_errors: bool = False,
+    _tool_test_dicts: Optional[ToolTestDictsT] = None,  # extension point only for tests
 ):
     if resource_parameters is None:
         resource_parameters = {}
     if client_test_config is None:
         client_test_config = NullClientTestConfig()
-    tool_test_dicts = tool_test_dicts or galaxy_interactor.get_tool_tests(tool_id, tool_version=tool_version)
+    tool_test_dicts = _tool_test_dicts or galaxy_interactor.get_tool_tests(tool_id, tool_version=tool_version)
     tool_test_dict = tool_test_dicts[test_index]
     if "test_index" not in tool_test_dict:
         tool_test_dict["test_index"] = test_index
@@ -1272,7 +1314,7 @@ def verify_tool(
         return
 
     tool_test_dict.setdefault("maxseconds", maxseconds)
-    testdef = ToolTestDescription(tool_test_dict)
+    testdef = ToolTestDescription(cast(ToolTestDict, tool_test_dict))
     _handle_def_errors(testdef)
 
     created_history = False
@@ -1553,15 +1595,21 @@ class ToolTestDescription:
     doing dynamic tests in this way allows better integration)
     """
 
-    def __init__(self, processed_test_dict):
+    def __init__(self, processed_test_dict: ToolTestDict):
         assert (
             "test_index" in processed_test_dict
         ), "Invalid processed test description, must have a 'test_index' for naming, etc.."
         test_index = processed_test_dict["test_index"]
         name = processed_test_dict.get("name", f"Test-{test_index + 1}")
-        maxseconds = processed_test_dict.get("maxseconds", DEFAULT_TOOL_TEST_WAIT)
-        if maxseconds is not None:
-            maxseconds = int(maxseconds)
+        error_in_test_definition = processed_test_dict["error"]
+        if not error_in_test_definition:
+            processed_test_dict = cast(ValidToolTestDict, processed_test_dict)
+            maxseconds = int(processed_test_dict.get("maxseconds") or DEFAULT_TOOL_TEST_WAIT or 86400)
+            output_collections = processed_test_dict.get("output_collections", [])
+        else:
+            processed_test_dict = cast(InvalidToolTestDict, processed_test_dict)
+            maxseconds = DEFAULT_TOOL_TEST_WAIT
+            output_collections = []
 
         self.test_index = test_index
         assert (
@@ -1590,9 +1638,7 @@ class ToolTestDescription:
         self.error = processed_test_dict.get("error", False)
         self.exception = processed_test_dict.get("exception", None)
 
-        self.output_collections = [
-            TestCollectionOutputDef.from_dict(d) for d in processed_test_dict.get("output_collections", [])
-        ]
+        self.output_collections = [TestCollectionOutputDef.from_dict(d) for d in output_collections]
         self.command_line = processed_test_dict.get("command_line", None)
         self.command_version = processed_test_dict.get("command_version", None)
         self.stdout = processed_test_dict.get("stdout", None)
diff --git a/lib/galaxy/tool_util/verify/script.py b/lib/galaxy/tool_util/verify/script.py
index 619ed8f87fe..8c03dcca5fa 100644
--- a/lib/galaxy/tool_util/verify/script.py
+++ b/lib/galaxy/tool_util/verify/script.py
@@ -26,6 +26,7 @@ import yaml
 from galaxy.tool_util.verify.interactor import (
     DictClientTestConfig,
     GalaxyInteractorApi,
+    ToolTestDictsT,
     verify_tool,
 )
 
@@ -338,7 +339,8 @@ def build_case_references(
                     test_reference = TestReference(tool_id, tool_version, test_index)
                     test_references.append(test_reference)
     else:
-        tool_test_dicts = galaxy_interactor.get_tool_tests(tool_id, tool_version=tool_version)
+        assert tool_id
+        tool_test_dicts: ToolTestDictsT = galaxy_interactor.get_tool_tests(tool_id, tool_version=tool_version)
         for i, tool_test_dict in enumerate(tool_test_dicts):
             this_tool_version = tool_test_dict.get("tool_version", tool_version)
             this_test_index = i
diff --git a/lib/galaxy/tool_util/xsd/galaxy.xsd b/lib/galaxy/tool_util/xsd/galaxy.xsd
index 4410ba89bf8..59fcba6ea45 100644
--- a/lib/galaxy/tool_util/xsd/galaxy.xsd
+++ b/lib/galaxy/tool_util/xsd/galaxy.xsd
@@ -237,7 +237,7 @@ a short [SPDX](https://spdx.org/licenses/) identifier for a license for this too
 wrapper. The tool wrapper version can be indepedent of the underlying tool. This
 license covers the tool XML and associated scripts shipped with the tool.
 
-This is interpreted as [schema.org/license](https://schema.org/license)).
+This is interpreted as [schema.org/license](https://schema.org/license) property.
 </xs:documentation>
         </xs:annotation>
       </xs:attribute>
@@ -1582,6 +1582,29 @@ temporary file, which will either be compared with the file named in the
 ``file`` attribute value or checked against assertions made by a child
 ``assert_contents`` tag to verify that the tool is functionally correct.
 
+Different methods can be chosen for the comparison with the local file specified
+by ``file`` using the ``compare`` attribute:
+
+- ``diff``: uses diff to compare the history data set and the file provided by
+  ``file``. Compressed files are decompressed before the compariopm if
+  ``decompress`` is set to ``true``. BAM files are converted to SAM before the
+  comparision and for pdf some special rules are implemented. The number of
+  allowed differences can be set with ``lines_diff``.  If ``sort="true"`` history
+  and local data is sorted before the comparison.
+- ``re_match``: each line of the history data set is compared to the regular
+  expression specified in the corresponding line of the ``file``. The allowed
+  number of non matching lines can be set with ``lines_diff`` and the history
+  dataset is sorted if ``sort`` is set to ``true``.
+- ``re_match_multiline``: it is checked if the history data sets matches the
+  multi line regular expression given in ``file``. The history dataset is sorted
+  before the comparison if the ``sort`` atrribute is set to ``true``.
+- ``contains``: check if each line in ``file`` is contained in the history data set.
+  The allowed number of lines that are not contained in the history dataset
+  can be set with ``lines_diff``.
+- ``sim_size``: compares the size of the history dataset and the ``file`` subject to
+  the values of the ``delta`` and ``delta_frac`` attributes. Note that a ``has_size``
+  content assertion should be preferred, because this avoids storing the test file.
+
         ]]></xs:documentation>
     </xs:annotation>
     <xs:sequence>
@@ -1631,9 +1654,12 @@ data type. If these do not match, the test will fail.
     </xs:attribute>
     <xs:attribute name="sort" type="PermissiveBoolean">
       <xs:annotation>
-        <xs:documentation xml:lang="en">This flag causes the lines of the output
-to be sorted before they are compared to the expected output. This could be
-useful for non-deterministic output.</xs:documentation>
+        <xs:documentation xml:lang="en"><![CDATA[
+
+Applies only if ``compare`` is ``diff``, ``re_match`` or ``re_match_multiline``. This flag causes the lines of the history data set to be sorted before the comparison. In case of ``diff`` and ``re_match`` also the local file is sorted. This could be
+useful for non-deterministic output.
+
+]]></xs:documentation>
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="value" type="xs:string">
@@ -1668,7 +1694,7 @@ it may be inconvenient to upload the entiry file and this can be used instead.
     </xs:attribute>
     <xs:attribute name="lines_diff" type="xs:integer">
       <xs:annotation>
-        <xs:documentation xml:lang="en">If ``compare`` is set to ``diff``, the number of lines of difference to allow (each line with a modification is a line added and a line removed so this counts as two lines).</xs:documentation>
+        <xs:documentation xml:lang="en">Applies only if ``compare`` is set to ``diff``, ``re_match``, and ``contains``. If ``compare`` is set to ``diff``, the number of lines of difference to allow (each line with a modification is a line added and a line removed so this counts as two lines).</xs:documentation>
       </xs:annotation>
     </xs:attribute>
     <xs:attribute name="decompress" type="PermissiveBoolean">
@@ -2049,7 +2075,7 @@ module.
   </xs:complexType>
   <xs:group name="TestAssertionsGeneral">
     <xs:annotation>
-      <xs:documentation xml:lang="en"><![CDATA[General asserions]]></xs:documentation>
+      <xs:documentation xml:lang="en"><![CDATA[General assertions]]></xs:documentation>
     </xs:annotation>
     <xs:choice>
       <xs:element name="has_size" type="AssertHasSize"/>
@@ -6793,6 +6819,31 @@ and ``bibtex`` are the only supported options.</xs:documentation>
           <xs:documentation xml:lang="en">Maximum reserved filesystem based storage for the designated temporary directory, in mebibytes (2**20 bytes), if runtime allows it (not yet implemented in Galaxy).</xs:documentation>
         </xs:annotation>
       </xs:enumeration>
+       <xs:enumeration value="cuda_version_min">
+        <xs:annotation>
+          <xs:documentation xml:lang="en">Minimum CUDA (runtime link library) runtime version, if runtime allows it (not yet implemented in Galaxy).</xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
+      <xs:enumeration value="cuda_compute_capability">
+        <xs:annotation>
+          <xs:documentation xml:lang="en">Minimum NVIDIA (hardware+driver) Compute capabilities (major, minor (can be a range or a list), if runtime allows it (not yet implemented in Galaxy).</xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
+      <xs:enumeration value="gpu_memory_min">
+        <xs:annotation>
+          <xs:documentation xml:lang="en">Minimum Memory of the GPU in mebibytes, if runtime allows it (not yet implemented in Galaxy).</xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
+      <xs:enumeration value="cuda_device_count_min">
+        <xs:annotation>
+          <xs:documentation xml:lang="en">Minimum CUDA device count, if runtime allows it (not yet implemented in Galaxy).</xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
+      <xs:enumeration value="cuda_device_count_max">
+        <xs:annotation>
+          <xs:documentation xml:lang="en">Maximum CUDA device count, if runtime allows it (not yet implemented in Galaxy).</xs:documentation>
+        </xs:annotation>
+      </xs:enumeration>
     </xs:restriction>
   </xs:simpleType>
   <xs:simpleType name="ContainerType">
@@ -6979,7 +7030,7 @@ and ``bibtex`` are the only supported options.</xs:documentation>
       <xs:documentation xml:lang="en">Type of comparison to use when comparing
 test generated output files to expected output files. Currently valid value are
 ``diff`` (the default), ``re_match``, ``re_match_multiline``,
-and ``contains``. In addtion there is ``sim_size`` which is discouraged in fafour of a ``has_size`` assertion.</xs:documentation>
+and ``contains``. In addition there is ``sim_size`` which is discouraged in favour of a ``has_size`` assertion.</xs:documentation>
     </xs:annotation>
     <xs:restriction base="xs:string">
       <xs:enumeration value="diff"/>
@@ -7006,7 +7057,7 @@ and ``contains``. In addtion there is ``sim_size`` which is discouraged in fafou
   </xs:simpleType>
   <xs:simpleType name="Bytes">
     <xs:annotation>
-      <xs:documentation xml:lang="en">Number of bytes alowing for suffix (k|K|M|G|P|E)i? </xs:documentation>
+      <xs:documentation xml:lang="en">Number of bytes allowing for suffix (k|K|M|G|P|E)i? </xs:documentation>
     </xs:annotation>
     <xs:restriction base="xs:string">
       <xs:pattern value="(0|[1-9][0-9]*)([kKMGTPE]i?)?"></xs:pattern>
diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py
index 72d6a580dd0..fba2844f7d0 100644
--- a/lib/galaxy/tools/__init__.py
+++ b/lib/galaxy/tools/__init__.py
@@ -3056,7 +3056,15 @@ class DataManagerTool(OutputParameterJSONTool):
         assert (
             data_manager is not None
         ), f"Invalid data manager ({data_manager_id}) requested. It may have been removed before the job completed."
-        data_manager.process_result(out_data)
+        data_manager_mode = param_dict.get("__data_manager_mode", "populate")
+        if data_manager_mode == "populate":
+            data_manager.process_result(out_data)
+        elif data_manager_mode == "dry_run":
+            pass
+        elif data_manager_mode == "bundle":
+            data_manager.write_bundle(out_data)
+        else:
+            raise Exception("Unknown data manager mode encountered type...")
 
     def get_default_history_by_trans(self, trans, create=False):
         def _create_data_manager_history(user):
diff --git a/lib/galaxy/tools/data_fetch.py b/lib/galaxy/tools/data_fetch.py
index de52e92bea8..e3db469dc99 100644
--- a/lib/galaxy/tools/data_fetch.py
+++ b/lib/galaxy/tools/data_fetch.py
@@ -352,12 +352,13 @@ def _fetch_target(upload_config: "UploadConfig", target):
             # TODO:
             # in galaxy json add 'extra_files' and point at target derived from extra_files:
 
-            needs_grooming = not link_data_only and datatype and datatype.dataset_content_needs_grooming(path)
+            needs_grooming = not link_data_only and datatype and datatype.dataset_content_needs_grooming(path)  # type: ignore[arg-type]
             if needs_grooming:
                 # Groom the dataset content if necessary
                 transform.append(
                     {"action": "datatype_groom", "datatype_ext": ext, "datatype_class": datatype.__class__.__name__}
                 )
+                assert path
                 datatype.groom_dataset_content(path)
 
             if len(transform) > 0:
diff --git a/lib/galaxy/tools/data_manager/manager.py b/lib/galaxy/tools/data_manager/manager.py
index d418758e291..89894db1f30 100644
--- a/lib/galaxy/tools/data_manager/manager.py
+++ b/lib/galaxy/tools/data_manager/manager.py
@@ -1,5 +1,4 @@
 import errno
-import json
 import logging
 import os
 from typing import (
@@ -7,23 +6,28 @@ from typing import (
     Optional,
 )
 
+from typing_extensions import Protocol
+
 from galaxy import util
-from galaxy.structured_app import MinimalManagerApp
-from galaxy.tools.data import TabularToolDataTable
-from galaxy.util.template import fill_template
+from galaxy.structured_app import StructuredApp
+from galaxy.tool_util.data import (
+    BundleProcessingOptions,
+    OutputDataset,
+)
+from galaxy.tool_util.data.bundles.models import (
+    convert_data_tables_xml,
+    RepoInfo,
+)
+from galaxy.util import Element
 
 log = logging.getLogger(__name__)
 
-SUPPORTED_DATA_TABLE_TYPES = TabularToolDataTable
-VALUE_TRANSLATION_FUNCTIONS = dict(abspath=os.path.abspath)
-DEFAULT_VALUE_TRANSLATION_TYPE = "template"
-
 
 class DataManagers:
     data_managers: Dict[str, "DataManager"]
     managed_data_tables: Dict[str, "DataManager"]
 
-    def __init__(self, app: MinimalManagerApp, xml_filename=None):
+    def __init__(self, app: StructuredApp, xml_filename=None):
         self.app = app
         self.data_managers = {}
         self.managed_data_tables = {}
@@ -90,7 +94,7 @@ class DataManagers:
         if data_manager.id in self.data_managers:
             log.warning(f"A data manager has been defined twice: {data_manager.id} ")
         self.data_managers[data_manager.id] = data_manager
-        for data_table_name in data_manager.data_tables.keys():
+        for data_table_name in data_manager.data_table_names:
             if data_table_name not in self.managed_data_tables:
                 self.managed_data_tables[data_table_name] = []
             self.managed_data_tables[data_table_name].append(data_manager)
@@ -109,21 +113,29 @@ class DataManagers:
                 if data_manager.tool:
                     self.app.toolbox.remove_tool_by_id(data_manager.tool.id)
                 # determine if any data_tables are no longer tracked
-                for data_table_name in data_manager.data_tables.keys():
+                for data_table_name in data_manager.data_table_names:
                     remove_data_table_tracking = True
                     for other_data_manager in self.data_managers.values():
-                        if data_table_name in other_data_manager.data_tables:
+                        if data_table_name in other_data_manager.data_table_names:
                             remove_data_table_tracking = False
                             break
                     if remove_data_table_tracking and data_table_name in self.managed_data_tables:
                         del self.managed_data_tables[data_table_name]
 
 
+class Tool(Protocol):
+    name: str
+    description: str
+    version: str
+
+
 class DataManager:
     GUID_TYPE = "data_manager"
     DEFAULT_VERSION = "0.0.1"
 
-    def __init__(self, data_managers, elem=None, tool_path=None):
+    tool: Optional[Tool]
+
+    def __init__(self, data_managers: DataManagers, elem: Element = None, tool_path: Optional[str] = None):
         self.data_managers = data_managers
         self.declared_id = None
         self.name = None
@@ -131,16 +143,12 @@ class DataManager:
         self.version = self.DEFAULT_VERSION
         self.guid = None
         self.tool = None
-        self.data_tables = {}
-        self.output_ref_by_data_table = {}
-        self.move_by_data_table_column = {}
-        self.value_translation_by_data_table_column = {}
-        self.tool_shed_repository_info_dict = None
+        self.tool_shed_repository_info: Optional[RepoInfo] = None
         self.undeclared_tables = False
         if elem is not None:
-            self.load_from_element(elem, tool_path or self.data_managers.tool_path)
+            self._load_from_element(elem, tool_path or self.data_managers.tool_path)
 
-    def load_from_element(self, elem, tool_path):
+    def _load_from_element(self, elem: Element, tool_path: Optional[str]) -> None:
         assert (
             elem.tag == "data_manager"
         ), f'A data manager configuration must have a "data_manager" tag as the root. "{elem.tag}" is present'
@@ -159,7 +167,7 @@ class DataManager:
             tool_guid = tool_elem.get("guid")
             # need to determine repository info so that dependencies will work correctly
             tool_shed_repository = self.data_managers.app.toolbox.get_tool_repository_from_xml_item(tool_elem, path)
-            self.tool_shed_repository_info_dict = dict(
+            self.tool_shed_repository_info = RepoInfo(
                 tool_shed=tool_shed_repository.tool_shed,
                 name=tool_shed_repository.name,
                 owner=tool_shed_repository.owner,
@@ -172,101 +180,28 @@ class DataManager:
                 if shed_conf:
                     tool_path = shed_conf.get("tool_path", tool_path)
         assert path is not None, f"A tool file path could not be determined:\n{util.xml_to_string(elem)}"
-        self.load_tool(
+        assert tool_path, "A tool root path is required"
+        self._load_tool(
             os.path.join(tool_path, path),
             guid=tool_guid,
             data_manager_id=self.id,
             tool_shed_repository=tool_shed_repository,
         )
+        assert self.tool
         self.name = elem.get("name", self.tool.name)
         self.description = elem.get("description", self.tool.description)
-        self.undeclared_tables = util.asbool(elem.get("undeclared_tables", self.undeclared_tables))
         self.version = elem.get("version", self.tool.version)
-
-        for data_table_elem in elem.findall("data_table"):
-            data_table_name = data_table_elem.get("name")
-            assert data_table_name is not None, "A name is required for a data table entry"
-            if data_table_name not in self.data_tables:
-                self.data_tables[data_table_name] = {}
-            output_elem = data_table_elem.find("output")
-            if output_elem is not None:
-                for column_elem in output_elem.findall("column"):
-                    column_name = column_elem.get("name", None)
-                    assert column_name is not None, "Name is required for column entry"
-                    data_table_coumn_name = column_elem.get("data_table_name", column_name)
-                    self.data_tables[data_table_name][data_table_coumn_name] = column_name
-                    output_ref = column_elem.get("output_ref", None)
-                    if output_ref is not None:
-                        if data_table_name not in self.output_ref_by_data_table:
-                            self.output_ref_by_data_table[data_table_name] = {}
-                        self.output_ref_by_data_table[data_table_name][data_table_coumn_name] = output_ref
-                    value_translation_elems = column_elem.findall("value_translation")
-                    if value_translation_elems is not None:
-                        for value_translation_elem in value_translation_elems:
-                            value_translation = value_translation_elem.text
-                            if value_translation is not None:
-                                value_translation_type = value_translation_elem.get(
-                                    "type", DEFAULT_VALUE_TRANSLATION_TYPE
-                                )
-                                if data_table_name not in self.value_translation_by_data_table_column:
-                                    self.value_translation_by_data_table_column[data_table_name] = {}
-                                if (
-                                    data_table_coumn_name
-                                    not in self.value_translation_by_data_table_column[data_table_name]
-                                ):
-                                    self.value_translation_by_data_table_column[data_table_name][
-                                        data_table_coumn_name
-                                    ] = []
-                                if value_translation_type == "function":
-                                    if value_translation in VALUE_TRANSLATION_FUNCTIONS:
-                                        value_translation = VALUE_TRANSLATION_FUNCTIONS[value_translation]
-                                    else:
-                                        raise ValueError(
-                                            f"Unsupported value translation function: '{value_translation}'"
-                                        )
-                                else:
-                                    assert value_translation_type == DEFAULT_VALUE_TRANSLATION_TYPE, ValueError(
-                                        f"Unsupported value translation type: '{value_translation_type}'"
-                                    )
-                                self.value_translation_by_data_table_column[data_table_name][
-                                    data_table_coumn_name
-                                ].append(value_translation)
-
-                    for move_elem in column_elem.findall("move"):
-                        move_type = move_elem.get("type", "directory")
-                        relativize_symlinks = move_elem.get(
-                            "relativize_symlinks", False
-                        )  # TODO: should we instead always relativize links?
-                        source_elem = move_elem.find("source")
-                        if source_elem is None:
-                            source_base = None
-                            source_value = ""
-                        else:
-                            source_base = source_elem.get("base", None)
-                            source_value = source_elem.text
-                        target_elem = move_elem.find("target")
-                        if target_elem is None:
-                            target_base = None
-                            target_value = ""
-                        else:
-                            target_base = target_elem.get("base", None)
-                            target_value = target_elem.text
-                        if data_table_name not in self.move_by_data_table_column:
-                            self.move_by_data_table_column[data_table_name] = {}
-                        self.move_by_data_table_column[data_table_name][data_table_coumn_name] = dict(
-                            type=move_type,
-                            source_base=source_base,
-                            source_value=source_value,
-                            target_base=target_base,
-                            target_value=target_value,
-                            relativize_symlinks=relativize_symlinks,
-                        )
+        self.processor_description = convert_data_tables_xml(elem)
 
     @property
     def id(self):
         return self.guid or self.declared_id  # if we have a guid, we will use that as the data_manager id
 
-    def load_tool(
+    @property
+    def data_table_names(self):
+        return self.processor_description.data_table_names
+
+    def _load_tool(
         self, tool_filename, guid=None, data_manager_id=None, tool_shed_repository_id=None, tool_shed_repository=None
     ):
         toolbox = self.data_managers.app.toolbox
@@ -282,193 +217,48 @@ class DataManager:
         self.tool = tool
         return tool
 
-    def process_result(self, out_data):
-        data_manager_dicts = {}
-        data_manager_dict = {}
-        # TODO: fix this merging below
-        for output_name, output_dataset in out_data.items():
-            try:
-                output_dict = json.loads(open(output_dataset.file_name).read())
-            except Exception as e:
-                log.warning(f'Error reading DataManagerTool json for "{output_name}": {e}')
-                continue
-            data_manager_dicts[output_name] = output_dict
-            for key, value in output_dict.items():
-                if key not in data_manager_dict:
-                    data_manager_dict[key] = {}
-                data_manager_dict[key].update(value)
-            data_manager_dict.update(output_dict)
+    def process_result(self, out_data: Dict[str, OutputDataset]) -> None:
+        tool_data_tables = self.data_managers.app.tool_data_tables
+        options = BundleProcessingOptions(
+            what=f"data manager '{self.id}'",
+            data_manager_path=self._data_manager_path,
+            target_config_file=self.data_managers.filename,
+        )
+        updated_data_tables = tool_data_tables.process_bundle(
+            out_data,
+            self.processor_description,
+            self.repo_info,
+            options,
+        )
+        for data_table_name in updated_data_tables:
+            self._reload(data_table_name)
 
-        data_tables_dict = data_manager_dict.get("data_tables", {})
-        for data_table_name in self.data_tables.keys():
-            data_table_values = data_tables_dict.pop(data_table_name, None)
-            if not data_table_values:
-                log.warning(
-                    f'No values for data table "{data_table_name}" were returned by the data manager "{self.id}".'
-                )
-                continue  # next data table
-            data_table_remove_values = None
-            if isinstance(data_table_values, dict):
-                values_to_add = data_table_values.get("add")
-                data_table_remove_values = data_table_values.get("remove")
-                if values_to_add or data_table_remove_values:
-                    # We don't have an old style data table definition
-                    data_table_values = values_to_add
+    def write_bundle(
+        self,
+        out_data: Dict[str, OutputDataset],
+    ) -> None:
+        tool_data_tables = self.data_managers.app.tool_data_tables
+        tool_data_tables.write_bundle(
+            out_data,
+            self.processor_description,
+            self.repo_info,
+        )
 
-            data_table = self.data_managers.app.tool_data_tables.get(data_table_name, None)
-            if data_table is None:
-                log.error(
-                    f'The data manager "{self.id}" returned an unknown data table "{data_table_name}" with new entries "{data_table_values}". These entries will not be created. Please confirm that an entry for "{data_table_name}" exists in your "tool_data_table_conf.xml" file.'
-                )
-                continue  # next table name
-            if not isinstance(data_table, SUPPORTED_DATA_TABLE_TYPES):
-                log.error(
-                    f'The data manager "{self.id}" returned an unsupported data table "{data_table_name}" with type "{type(data_table)}" with new entries "{data_table_values}". These entries will not be created. Please confirm that the data table is of a supported type ({SUPPORTED_DATA_TABLE_TYPES}).'
-                )
-                continue  # next table name
-            output_ref_values = {}
-            if data_table_name in self.output_ref_by_data_table:
-                for data_table_column, output_ref in self.output_ref_by_data_table[data_table_name].items():
-                    output_ref_dataset = out_data.get(output_ref, None)
-                    assert output_ref_dataset is not None, "Referenced output was not found."
-                    output_ref_values[data_table_column] = output_ref_dataset
+    @property
+    def _data_manager_path(self) -> str:
+        return self.data_managers.app.config.galaxy_data_manager_data_path
 
-            if not isinstance(data_table_values, list):
-                data_table_values = [data_table_values] if data_table_values else []
-            if not isinstance(data_table_remove_values, list):
-                data_table_remove_values = [data_table_remove_values] if data_table_remove_values else []
-            for data_table_row in data_table_values:
-                data_table_value = dict(**data_table_row)  # keep original values here
-                for (
-                    name
-                ) in (
-                    data_table_row.keys()
-                ):  # FIXME: need to loop through here based upon order listed in data_manager config
-                    if name in output_ref_values:
-                        self.process_move(
-                            data_table_name, name, output_ref_values[name].extra_files_path, **data_table_value
-                        )
-                        data_table_value[name] = self.process_value_translation(
-                            data_table_name, name, **data_table_value
-                        )
-                data_table.add_entry(data_table_value, persist=True, entry_source=self)
-            # Removes data table entries
-            for data_table_row in data_table_remove_values:
-                data_table_value = dict(**data_table_row)  # keep original values here
-                data_table.remove_entry(list(data_table_value.values()))
+    def _reload(self, data_table_name: str) -> None:
+        self.data_managers.app.queue_worker.send_control_task(
+            "reload_tool_data_tables", noop_self=True, kwargs={"table_name": data_table_name}
+        )
 
-            self.data_managers.app.queue_worker.send_control_task(
-                "reload_tool_data_tables", noop_self=True, kwargs={"table_name": data_table_name}
-            )
-        if self.undeclared_tables and data_tables_dict:
-            # We handle the data move, by just moving all the data out of the extra files path
-            # moving a directory and the target already exists, we move the contents instead
-            log.debug("Attempting to add entries for undeclared tables: %s.", ", ".join(data_tables_dict.keys()))
-            for ref_file in out_data.values():
-                if ref_file.extra_files_path_exists():
-                    util.move_merge(
-                        ref_file.extra_files_path, self.data_managers.app.config.galaxy_data_manager_data_path
-                    )
-            path_column_names = ["path"]
-            for data_table_name, data_table_values in data_tables_dict.items():
-                data_table = self.data_managers.app.tool_data_tables.get(data_table_name, None)
-                if not isinstance(data_table_values, list):
-                    data_table_values = [data_table_values]
-                for data_table_row in data_table_values:
-                    data_table_value = dict(**data_table_row)  # keep original values here
-                    for name, value in data_table_row.items():
-                        if name in path_column_names:
-                            data_table_value[name] = os.path.abspath(
-                                os.path.join(self.data_managers.app.config.galaxy_data_manager_data_path, value)
-                            )
-                    data_table.add_entry(data_table_value, persist=True, entry_source=self)
-                self.data_managers.app.queue_worker.send_control_task(
-                    "reload_tool_data_tables", noop_self=True, kwargs={"table_name": data_table_name}
-                )
-        else:
-            for data_table_name, data_table_values in data_tables_dict.items():
-                # tool returned extra data table entries, but data table was not declared in data manager
-                # do not add these values, but do provide messages
-                log.warning(
-                    f'The data manager "{self.id}" returned an undeclared data table "{data_table_name}" with new entries "{data_table_values}". These entries will not be created. Please confirm that an entry for "{data_table_name}" exists in your "{self.data_managers.filename}" file.'
-                )
+    @property
+    def repo_info(self) -> Optional[RepoInfo]:
+        return self.tool_shed_repository_info
 
-    def process_move(self, data_table_name, column_name, source_base_path, relative_symlinks=False, **kwd):
-        if (
-            data_table_name in self.move_by_data_table_column
-            and column_name in self.move_by_data_table_column[data_table_name]
-        ):
-            move_dict = self.move_by_data_table_column[data_table_name][column_name]
-            source = move_dict["source_base"]
-            if source is None:
-                source = source_base_path
-            else:
-                source = fill_template(
-                    source,
-                    GALAXY_DATA_MANAGER_DATA_PATH=self.data_managers.app.config.galaxy_data_manager_data_path,
-                    **kwd,
-                ).strip()
-            if move_dict["source_value"]:
-                source = os.path.join(
-                    source,
-                    fill_template(
-                        move_dict["source_value"],
-                        GALAXY_DATA_MANAGER_DATA_PATH=self.data_managers.app.config.galaxy_data_manager_data_path,
-                        **kwd,
-                    ).strip(),
-                )
-            target = move_dict["target_base"]
-            if target is None:
-                target = self.data_managers.app.config.galaxy_data_manager_data_path
-            else:
-                target = fill_template(
-                    target,
-                    GALAXY_DATA_MANAGER_DATA_PATH=self.data_managers.app.config.galaxy_data_manager_data_path,
-                    **kwd,
-                ).strip()
-            if move_dict["target_value"]:
-                target = os.path.join(
-                    target,
-                    fill_template(
-                        move_dict["target_value"],
-                        GALAXY_DATA_MANAGER_DATA_PATH=self.data_managers.app.config.galaxy_data_manager_data_path,
-                        **kwd,
-                    ).strip(),
-                )
-
-            if move_dict["type"] == "file":
-                dirs = os.path.split(target)[0]
-                try:
-                    os.makedirs(dirs)
-                except OSError as e:
-                    if e.errno != errno.EEXIST:
-                        raise e
-            # moving a directory and the target already exists, we move the contents instead
-            if os.path.exists(source):
-                util.move_merge(source, target)
-
-            if move_dict.get("relativize_symlinks", False):
-                util.relativize_symlinks(target)
-
-            return True
-        return False
-
-    def process_value_translation(self, data_table_name, column_name, **kwd):
-        value = kwd.get(column_name)
-        if (
-            data_table_name in self.value_translation_by_data_table_column
-            and column_name in self.value_translation_by_data_table_column[data_table_name]
-        ):
-            for value_translation in self.value_translation_by_data_table_column[data_table_name][column_name]:
-                if isinstance(value_translation, str):
-                    value = fill_template(
-                        value_translation,
-                        GALAXY_DATA_MANAGER_DATA_PATH=self.data_managers.app.config.galaxy_data_manager_data_path,
-                        **kwd,
-                    ).strip()
-                else:
-                    value = value_translation(value)
-        return value
-
-    def get_tool_shed_repository_info_dict(self):
-        return self.tool_shed_repository_info_dict
+    # legacy stuff because tool shed code calls this...
+    # data manager manual integration test provides coverage
+    def get_tool_shed_repository_info_dict(self) -> Optional[dict]:
+        repo_info = self.repo_info
+        return repo_info.dict() if repo_info else None
diff --git a/lib/galaxy/tools/execute.py b/lib/galaxy/tools/execute.py
index 46113ff8b6e..507b68abaf5 100644
--- a/lib/galaxy/tools/execute.py
+++ b/lib/galaxy/tools/execute.py
@@ -95,6 +95,8 @@ def execute(
             "internals.galaxy.tools.execute.job_single", SINGLE_EXECUTION_SUCCESS_MESSAGE
         )
         params = execution_slice.param_combination
+        if "__data_manager_mode" in mapping_params.param_template:
+            params["__data_manager_mode"] = mapping_params.param_template["__data_manager_mode"]
         if workflow_invocation_uuid:
             params["__workflow_invocation_uuid__"] = workflow_invocation_uuid
         elif "__workflow_invocation_uuid__" in params:
diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py
index 4eb129081b3..e84317ff557 100644
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -542,7 +542,7 @@ class BooleanToolParameter(ToolParameter):
     >>> p = BooleanToolParameter(None, XML('<param name="_name" type="boolean" checked="yes" truevalue="_truevalue" falsevalue="_falsevalue" />'))
     >>> print(p.name)
     _name
-    >>> assert sorted(p.to_dict(trans).items()) == [('argument', None), ('falsevalue', '_falsevalue'), ('help', ''), ('hidden', False), ('is_dynamic', False), ('label', ''), ('model_class', 'BooleanToolParameter'), ('name', '_name'), ('optional', False), ('refresh_on_change', False), ('truevalue', '_truevalue'), ('type', 'boolean'), ('value', 'true')]
+    >>> assert sorted(p.to_dict(trans).items()) == [('argument', None), ('falsevalue', '_falsevalue'), ('help', ''), ('hidden', False), ('is_dynamic', False), ('label', ''), ('model_class', 'BooleanToolParameter'), ('name', '_name'), ('optional', False), ('refresh_on_change', False), ('truevalue', '_truevalue'), ('type', 'boolean'), ('value', True)]
     >>> print(p.from_json('true'))
     True
     >>> print(p.to_param_dict_string(True))
@@ -551,6 +551,12 @@ class BooleanToolParameter(ToolParameter):
     False
     >>> print(p.to_param_dict_string(False))
     _falsevalue
+    >>> value = p.to_json('false', trans.app, use_security=False)
+    >>> assert isinstance(value, bool)
+    >>> assert value == False
+    >>> value = p.to_json(True, trans.app, use_security=False)
+    >>> assert isinstance(value, bool)
+    >>> assert value == True
     """
 
     def __init__(self, tool, input_source):
@@ -573,8 +579,7 @@ class BooleanToolParameter(ToolParameter):
         return ret_val
 
     def to_json(self, value, app, use_security):
-        rval = json.dumps(self.to_python(value, app))
-        return rval
+        return self.to_python(value, app)
 
     def get_initial_value(self, trans, other_values):
         return self.checked
diff --git a/lib/galaxy/tools/parameters/dynamic_options.py b/lib/galaxy/tools/parameters/dynamic_options.py
index ef4cbabd063..19fd5fb7df5 100644
--- a/lib/galaxy/tools/parameters/dynamic_options.py
+++ b/lib/galaxy/tools/parameters/dynamic_options.py
@@ -113,7 +113,7 @@ class RegexpFilter(Filter):
             pass
         filter_pattern = re.compile(filter_value)
         for fields in options:
-            if self.keep == (not filter_pattern.match(fields[self.column]) is None):
+            if self.keep == (filter_pattern.match(fields[self.column]) is not None):
                 rval.append(fields)
         return rval
 
diff --git a/lib/galaxy/tools/recommendations.py b/lib/galaxy/tools/recommendations.py
index 7eb612d9d11..6443ea2f987 100644
--- a/lib/galaxy/tools/recommendations.py
+++ b/lib/galaxy/tools/recommendations.py
@@ -18,6 +18,12 @@ log = logging.getLogger(__name__)
 
 
 class ToolRecommendations:
+    max_seq_len = 25
+    ff_dim = 128
+    embed_dim = 128
+    num_heads = 4
+    dropout = 0.1
+
     def __init__(self):
         self.tool_recommendation_model_path = None
         self.admin_tool_recommendations_path = None
@@ -27,12 +33,85 @@ class ToolRecommendations:
         self.reverse_dictionary = dict()
         self.all_tools = dict()
         self.tool_weights_sorted = dict()
-        self.session = None
-        self.graph = None
         self.loaded_model = None
         self.compatible_tools = None
         self.standard_connections = None
-        self.max_seq_len = 25
+        self.model_ok = None
+
+    def create_transformer_model(self, vocab_size):
+        try:
+            from tensorflow.keras.layers import (
+                Dense,
+                Dropout,
+                Embedding,
+                GlobalAveragePooling1D,
+                Input,
+                Layer,
+                LayerNormalization,
+                MultiHeadAttention,
+            )
+            from tensorflow.keras.models import (
+                Model,
+                Sequential,
+            )
+        except Exception as e:
+            log.exception(e)
+            return None
+
+        class TransformerBlock(Layer):
+            def __init__(self, embed_dim, num_heads, ff_dim, rate=0.1):
+                super().__init__()
+                self.att = MultiHeadAttention(num_heads=num_heads, key_dim=embed_dim, dropout=rate)
+                self.ffn = Sequential([Dense(ff_dim, activation="relu"), Dense(embed_dim)])
+                self.layernorm1 = LayerNormalization(epsilon=1e-6)
+                self.layernorm2 = LayerNormalization(epsilon=1e-6)
+                self.dropout1 = Dropout(rate)
+                self.dropout2 = Dropout(rate)
+
+            def call(self, inputs, training):
+                attn_output, attention_scores = self.att(
+                    inputs, inputs, inputs, return_attention_scores=True, training=training
+                )
+                attn_output = self.dropout1(attn_output, training=training)
+                out1 = self.layernorm1(inputs + attn_output)
+                ffn_output = self.ffn(out1)
+                ffn_output = self.dropout2(ffn_output, training=training)
+                return self.layernorm2(out1 + ffn_output), attention_scores
+
+        class TokenAndPositionEmbedding(Layer):
+            def __init__(self, maxlen, vocab_size, embed_dim):
+                super().__init__()
+                self.token_emb = Embedding(input_dim=vocab_size, output_dim=embed_dim, mask_zero=True)
+                self.pos_emb = Embedding(input_dim=maxlen, output_dim=embed_dim, mask_zero=True)
+
+            def call(self, x):
+                try:
+                    import tensorflow as tf
+
+                    maxlen = tf.shape(x)[-1]
+                    positions = tf.range(start=0, limit=maxlen, delta=1)
+                    positions = self.pos_emb(positions)
+                    x = self.token_emb(x)
+                    return x + positions
+                except Exception as e:
+                    log.exception(e)
+                    return None
+
+        inputs = Input(shape=(ToolRecommendations.max_seq_len,))
+        embedding_layer = TokenAndPositionEmbedding(
+            ToolRecommendations.max_seq_len, vocab_size, ToolRecommendations.embed_dim
+        )
+        x = embedding_layer(inputs)
+        transformer_block = TransformerBlock(
+            ToolRecommendations.embed_dim, ToolRecommendations.num_heads, ToolRecommendations.ff_dim
+        )
+        x, weights = transformer_block(x)
+        x = GlobalAveragePooling1D()(x)
+        x = Dropout(ToolRecommendations.dropout)(x)
+        x = Dense(ToolRecommendations.ff_dim, activation="relu")(x)
+        x = Dropout(ToolRecommendations.dropout)(x)
+        outputs = Dense(vocab_size, activation="sigmoid")(x)
+        return Model(inputs=inputs, outputs=[outputs, weights])
 
     def get_predictions(self, trans, tool_sequence, remote_model_url):
         """
@@ -40,73 +119,37 @@ class ToolRecommendations:
         """
         recommended_tools = dict()
         self.__collect_admin_preferences(trans.app.config.admin_tool_recommendations_path)
-        is_set = self.__set_model(trans, remote_model_url)
-        if is_set is True:
-            # get the recommended tools for a tool sequence
-            recommended_tools = self.__compute_tool_prediction(trans, tool_sequence)
-        else:
-            tool_sequence = ""
+        if self.model_ok is None:
+            self.__set_model(trans, remote_model_url)
+        recommended_tools = self.__compute_tool_prediction(trans, tool_sequence)
         return tool_sequence, recommended_tools
 
     def __set_model(self, trans, remote_model_url):
         """
         Create model and associated dictionaries for recommendations
         """
-        if not self.graph:
-            # import moves from the top of file: in case the tool recommendation feature is disabled,
-            # keras is not downloaded because of conditional requirement and Galaxy does not build
-            try:
-                import tensorflow as tf
+        self.tool_recommendation_model_path = self.__download_model(remote_model_url)
+        model_file = h5py.File(self.tool_recommendation_model_path, "r")
+        self.reverse_dictionary = json.loads(model_file["reverse_dict"][()].decode("utf-8"))
+        self.loaded_model = self.create_transformer_model(len(self.reverse_dictionary) + 1)
+        self.loaded_model.load_weights(self.tool_recommendation_model_path)
 
-                tf.compat.v1.disable_v2_behavior()
-            except Exception:
-                trans.response.status = 400
-                return False
-            # set graph and session only once
-            if self.graph is None:
-                self.graph = tf.Graph()
-                self.session = tf.compat.v1.Session(graph=self.graph)
-            model_weights = list()
-            counter_layer_weights = 0
-            self.tool_recommendation_model_path = self.__download_model(remote_model_url)
-            # read the hdf5 attributes
-            trained_model = h5py.File(self.tool_recommendation_model_path, "r")
-            model_config = json.loads(trained_model["model_config"][()])
-            # set tensorflow's graph and session to maintain
-            # consistency between model load and predict methods
-            with self.graph.as_default():
-                with self.session.as_default():
-                    try:
-                        # iterate through all the attributes of the model to find weights of neural network layers
-                        for item in trained_model.keys():
-                            if "weight_" in item:
-                                weight = trained_model[f"weight_{str(counter_layer_weights)}"][()]
-                                model_weights.append(weight)
-                                counter_layer_weights += 1
-                        self.loaded_model = tf.keras.models.model_from_json(model_config)
-                        self.loaded_model.set_weights(model_weights)
-                    except Exception as e:
-                        log.exception(e)
-                        trans.response.status = 400
-                        return False
-            # set the dictionary of tools
-            self.model_data_dictionary = json.loads(trained_model["data_dictionary"][()])
-            self.reverse_dictionary = {v: k for k, v in self.model_data_dictionary.items()}
-            # set the list of compatible tools
-            self.compatible_tools = json.loads(trained_model["compatible_tools"][()])
-            tool_weights = json.loads(trained_model["class_weights"][()])
-            self.standard_connections = json.loads(trained_model["standard_connections"][()])
-            # sort the tools' usage dictionary
-            tool_pos_sorted = [int(key) for key in tool_weights.keys()]
-            for k in tool_pos_sorted:
-                self.tool_weights_sorted[k] = tool_weights[str(k)]
-            # collect ids and names of all the installed tools
-            for tool_id, tool in trans.app.toolbox.tools():
-                t_id_renamed = tool_id
-                if t_id_renamed.find("/") > -1:
-                    t_id_renamed = t_id_renamed.split("/")[-2]
-                self.all_tools[t_id_renamed] = (tool_id, tool.name)
-        return True
+        self.model_data_dictionary = {v: k for k, v in self.reverse_dictionary.items()}
+        # set the list of compatible tools
+        self.compatible_tools = json.loads(model_file["compatible_tools"][()].decode("utf-8"))
+        tool_weights = json.loads(model_file["class_weights"][()].decode("utf-8"))
+        self.standard_connections = json.loads(model_file["standard_connections"][()].decode("utf-8"))
+        # sort the tools' usage dictionary
+        tool_pos_sorted = [int(key) for key in tool_weights.keys()]
+        for k in tool_pos_sorted:
+            self.tool_weights_sorted[k] = tool_weights[str(k)]
+        # collect ids and names of all the installed tools
+        for tool_id, tool in trans.app.toolbox.tools():
+            t_id_renamed = tool_id
+            if t_id_renamed.find("/") > -1:
+                t_id_renamed = t_id_renamed.split("/")[-2]
+            self.all_tools[t_id_renamed] = (tool_id, tool.name)
+        self.model_ok = True
 
     def __collect_admin_preferences(self, admin_path):
         """
@@ -168,8 +211,13 @@ class ToolRecommendations:
         Add admin preferences to recommendations.
         """
         last_compatible_tools = list()
-        if last_tool_name in self.compatible_tools:
-            last_compatible_tools = self.compatible_tools[last_tool_name].split(",")
+        if last_tool_name in self.model_data_dictionary:
+            last_tool_name_id = self.model_data_dictionary[last_tool_name]
+            if last_tool_name_id in self.compatible_tools:
+                last_compatible_tools = [
+                    self.reverse_dictionary[t_id] for t_id in self.compatible_tools[last_tool_name_id]
+                ]
+
         prediction_data["is_deprecated"] = False
         # get the list of datatype extensions of the last tool of the tool sequence
         _, last_output_extensions = self.__get_tool_extensions(trans, self.all_tools[last_tool_name][0])
@@ -182,8 +230,8 @@ class ToolRecommendations:
                 # select the name and tool id if it is installed in Galaxy
                 if (
                     t_id == child
-                    and score > 0.0
-                    and child in last_compatible_tools
+                    and score >= 0.0
+                    and t_id in last_compatible_tools
                     and child not in self.deprecated_tools
                 ):
                     full_tool_id = self.all_tools[t_id][0]
@@ -223,8 +271,15 @@ class ToolRecommendations:
         """
         Get predicted tools. If predicted tools are less in number, combine them with published tools
         """
-        intersection = list(set(predictions).intersection(set(base_tools)))
-        return intersection[:topk]
+        t_intersect = list(set(predictions).intersection(set(base_tools)))
+        t_diff = list(set(predictions).difference(set(base_tools)))
+        t_intersect, u_intersect = self.__sort_by_usage(
+            t_intersect, self.tool_weights_sorted, self.model_data_dictionary
+        )
+        t_diff, u_diff = self.__sort_by_usage(t_diff, self.tool_weights_sorted, self.model_data_dictionary)
+        t_intersect.extend(t_diff)
+        u_intersect.extend(u_diff)
+        return t_intersect, u_intersect
 
     def __sort_by_usage(self, t_list, class_weights, d_dict):
         """
@@ -233,7 +288,7 @@ class ToolRecommendations:
         tool_dict = dict()
         for tool in t_list:
             t_id = d_dict[tool]
-            tool_dict[tool] = class_weights[t_id]
+            tool_dict[tool] = class_weights[int(t_id)]
         tool_dict = dict(sorted(tool_dict.items(), key=lambda kv: kv[1], reverse=True))
         return list(tool_dict.keys()), list(tool_dict.values())
 
@@ -242,19 +297,17 @@ class ToolRecommendations:
         Get predictions from published and normal workflows
         """
         last_base_tools = list()
-        predictions = predictions * weight_values
         prediction_pos = np.argsort(predictions, axis=-1)
         topk_prediction_pos = prediction_pos[-topk:]
         # get tool ids
-        pred_tool_ids = [self.reverse_dictionary[int(tool_pos)] for tool_pos in topk_prediction_pos]
+        pred_tool_names = [self.reverse_dictionary[str(tool_pos)] for tool_pos in topk_prediction_pos]
         if last_tool_name in base_tools:
             last_base_tools = base_tools[last_tool_name]
             if type(last_base_tools).__name__ == "str":
                 # get published or compatible tools for the last tool in a sequence of tools
                 last_base_tools = last_base_tools.split(",")
         # get predicted tools
-        p_tools = self.__get_predicted_tools(last_base_tools, pred_tool_ids, topk)
-        sorted_c_t, sorted_c_v = self.__sort_by_usage(p_tools, self.tool_weights_sorted, self.model_data_dictionary)
+        sorted_c_t, sorted_c_v = self.__get_predicted_tools(last_base_tools, pred_tool_names, topk)
         return sorted_c_t, sorted_c_v
 
     def __compute_tool_prediction(self, trans, tool_sequence):
@@ -286,30 +339,20 @@ class ToolRecommendations:
             weight_values = list(self.tool_weights_sorted.values())
             # predict next tools for a test path
             try:
-                # use the same graph and session to predict
-                with self.graph.as_default():
-                    with self.session.as_default():
-                        prediction = self.loaded_model.predict(sample)
+                import tensorflow as tf
+
+                sample = tf.convert_to_tensor(sample, dtype=tf.int64)
+                prediction, _ = self.loaded_model(sample, training=False)
             except Exception as e:
                 log.exception(e)
                 return prediction_data
             # get dimensions
             nw_dimension = prediction.shape[1]
             prediction = np.reshape(prediction, (nw_dimension,))
-            half_len = int(nw_dimension / 2)
             # get recommended tools from published workflows
             pub_t, pub_v = self.__separate_predictions(
-                self.standard_connections, prediction[:half_len], last_tool_name, weight_values, topk
+                self.standard_connections, prediction, last_tool_name, weight_values, topk
             )
-            # get recommended tools from normal workflows
-            c_t, c_v = self.__separate_predictions(
-                self.compatible_tools, prediction[half_len:], last_tool_name, weight_values, topk
-            )
-            # combine predictions coming from different workflows
-            # promote recommended tools coming from published workflows
-            # to the top and then show other recommendations
-            pub_t.extend(c_t)
-            pub_v.extend(c_v)
             # remove duplicates if any
             pub_t = list(dict.fromkeys(pub_t))
             pub_v = list(dict.fromkeys(pub_v))
diff --git a/lib/galaxy/tools/tag_collection_from_file.xml b/lib/galaxy/tools/tag_collection_from_file.xml
index 72bf1780b73..615684fed03 100644
--- a/lib/galaxy/tools/tag_collection_from_file.xml
+++ b/lib/galaxy/tools/tag_collection_from_file.xml
@@ -37,13 +37,13 @@
                     <assert_contents>
                         <has_text_matching expression="^This is a line of text.\n$" />
                     </assert_contents>
-                    <metadata name="tags" value="alias:f,alias:r1,group:sample1,name:forward,orientation:forward,zoo" />
+                    <metadata name="tags" value="name:forward,alias:f,alias:r1,group:sample1,orientation:forward,zoo" />
                 </element>
                 <element name="reverse">
                     <assert_contents>
                         <has_text_matching expression="^This is a different line of text.\n$" />
                     </assert_contents>
-                    <metadata name="tags" value="alias:r,alias:r2,group:sample2,name:reverse,orientation:reverse" />
+                    <metadata name="tags" value="name:reverse,alias:r,alias:r2,group:sample2,orientation:reverse" />
                 </element>
             </output_collection>
         </test>
@@ -66,13 +66,13 @@
                         <assert_contents>
                             <has_text_matching expression="^This is a line of text.\n$" />
                         </assert_contents>
-                        <metadata name="tags" value="alias:f,alias:r1,group:sample1,name:forward,orientation:forward" />
+                        <metadata name="tags" value="name:forward,alias:f,alias:r1,group:sample1,orientation:forward" />
                     </element>
                     <element name="reverse">
                         <assert_contents>
                             <has_text_matching expression="^This is a different line of text.\n$" />
                         </assert_contents>
-                        <metadata name="tags" value="alias:r,alias:r2,group:sample2,name:reverse,orientation:reverse" />
+                        <metadata name="tags" value="name:reverse,alias:r,alias:r2,group:sample2,orientation:reverse" />
                     </element>
                 </element>
             </output_collection>
@@ -92,7 +92,7 @@ Description
 
 The relationship between element names and tags is specified in a two column tab-delimited file. This file may contain less entries than elements in the collection. In that case only matching list identifiers will be tagged.
 
-To create name: or group: tags prepend them with ``#`` (you can also use ``name:``) or ``group:``, respectively. 
+To create name: or group: tags prepend them with ``#`` (you can also use ``name:``) or ``group:``, respectively.
 
 ===============
 More about tags
@@ -100,7 +100,7 @@ More about tags
 
 Galaxy allows tagging datasets to facilitate analyses. There are several types of tags including simple tags, name tags, and group tags. **Simple** tags allow you to attach an alternative label to a dataset, which will make it easier to find it later. **Name** tags allow you to track propagation of a dataset through the analyses: all datasets derived from the initial dataset labeled with a name tag will inherit it. Finally, **group** tags allow you to label group of datasets. This is useful. for example, for differential expression analysis where you can have two groups of datasets labeled as "treatment" and "control".
 
-To learn mote about tags go to `our training site`_. 
+To learn mote about tags go to `our training site`_.
 
 .. _our training site: https://training.galaxyproject.org/training-material/search?query=tags
 
diff --git a/lib/galaxy/tools/test.py b/lib/galaxy/tools/test.py
index a6d047367d0..09b9bb609bc 100644
--- a/lib/galaxy/tools/test.py
+++ b/lib/galaxy/tools/test.py
@@ -4,11 +4,16 @@ import os.path
 from typing import (
     List,
     Tuple,
+    Union,
 )
 
 import galaxy.tools.parameters.basic
 import galaxy.tools.parameters.grouping
-from galaxy.tool_util.verify.interactor import ToolTestDescription
+from galaxy.tool_util.verify.interactor import (
+    InvalidToolTestDict,
+    ToolTestDescription,
+    ValidToolTestDict,
+)
 from galaxy.util import (
     string_as_bool,
     string_as_bool_or_none,
@@ -31,7 +36,7 @@ def parse_tests(tool, tests_source):
     return tests
 
 
-def description_from_tool_object(tool, test_index, raw_test_dict):
+def description_from_tool_object(tool, test_index, raw_test_dict) -> ToolTestDescription:
     required_files: List[Tuple[str, dict]] = []
     required_data_tables: List[str] = []
     required_loc_files: List[str] = []
@@ -39,41 +44,52 @@ def description_from_tool_object(tool, test_index, raw_test_dict):
     num_outputs = raw_test_dict.get("expect_num_outputs", None)
     if num_outputs:
         num_outputs = int(num_outputs)
+    maxseconds = raw_test_dict.get("maxseconds", None)
+    if maxseconds is not None:
+        maxseconds = int(maxseconds)
 
+    processed_test_dict: Union[ValidToolTestDict, InvalidToolTestDict]
     try:
         processed_inputs = _process_raw_inputs(
             tool, tool.inputs, raw_test_dict["inputs"], required_files, required_data_tables, required_loc_files
         )
-        processed_test_dict = {
-            "inputs": processed_inputs,
-            "outputs": raw_test_dict["outputs"],
-            "output_collections": raw_test_dict["output_collections"],
-            "num_outputs": num_outputs,
-            "command_line": raw_test_dict.get("command", None),
-            "command_version": raw_test_dict.get("command_version", None),
-            "stdout": raw_test_dict.get("stdout", None),
-            "stderr": raw_test_dict.get("stderr", None),
-            "expect_exit_code": raw_test_dict.get("expect_exit_code", None),
-            "expect_failure": raw_test_dict.get("expect_failure", False),
-            "expect_test_failure": raw_test_dict.get("expect_test_failure", False),
-            "required_files": required_files,
-            "required_data_tables": required_data_tables,
-            "required_loc_files": required_loc_files,
-            "tool_id": tool.id,
-            "tool_version": tool.version,
-            "test_index": test_index,
-            "error": False,
-        }
+
+        processed_test_dict = ValidToolTestDict(
+            {
+                "inputs": processed_inputs,
+                "outputs": raw_test_dict["outputs"],
+                "output_collections": raw_test_dict["output_collections"],
+                "num_outputs": num_outputs,
+                "command_line": raw_test_dict.get("command", None),
+                "command_version": raw_test_dict.get("command_version", None),
+                "stdout": raw_test_dict.get("stdout", None),
+                "stderr": raw_test_dict.get("stderr", None),
+                "expect_exit_code": raw_test_dict.get("expect_exit_code", None),
+                "expect_failure": raw_test_dict.get("expect_failure", False),
+                "expect_test_failure": raw_test_dict.get("expect_test_failure", False),
+                "required_files": required_files,
+                "required_data_tables": required_data_tables,
+                "required_loc_files": required_loc_files,
+                "tool_id": tool.id,
+                "tool_version": tool.version,
+                "test_index": test_index,
+                "maxseconds": maxseconds,
+                "error": False,
+            }
+        )
     except Exception as e:
         log.exception("Failed to load tool test number [%d] for %s" % (test_index, tool.id))
-        processed_test_dict = {
-            "tool_id": tool.id,
-            "tool_version": tool.version,
-            "test_index": test_index,
-            "inputs": {},
-            "error": True,
-            "exception": unicodify(e),
-        }
+        processed_test_dict = InvalidToolTestDict(
+            {
+                "tool_id": tool.id,
+                "tool_version": tool.version,
+                "test_index": test_index,
+                "inputs": {},
+                "error": True,
+                "exception": unicodify(e),
+                "maxseconds": maxseconds,
+            }
+        )
 
     return ToolTestDescription(processed_test_dict)
 
diff --git a/lib/galaxy/util/__init__.py b/lib/galaxy/util/__init__.py
index d72e90d924f..59e1ce1d22b 100644
--- a/lib/galaxy/util/__init__.py
+++ b/lib/galaxy/util/__init__.py
@@ -25,7 +25,10 @@ import threading
 import time
 import unicodedata
 import xml.dom.minidom
-from datetime import datetime
+from datetime import (
+    datetime,
+    timezone,
+)
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from hashlib import md5
@@ -1806,6 +1809,17 @@ def is_url(uri, allow_list=None):
     return any(uri.startswith(scheme) for scheme in allow_list)
 
 
+def check_github_api_response_rate_limit(response):
+    if response.status_code == 403 and "API rate limit exceeded" in response.json()["message"]:
+        # It can take tens of minutes before the rate limit window resets
+        message = "GitHub API rate limit exceeded."
+        rate_limit_reset_UTC_timestamp = response.headers.get("X-RateLimit-Reset")
+        if rate_limit_reset_UTC_timestamp:
+            rate_limit_reset_datetime = datetime.fromtimestamp(int(rate_limit_reset_UTC_timestamp), tz=timezone.utc)
+            message += f" The rate limit window will reset at {rate_limit_reset_datetime.isoformat()}."
+        raise Exception(message)
+
+
 def download_to_file(url, dest_file_path, timeout=30, chunk_size=2**20):
     """Download a URL to a file in chunks."""
     with requests.get(url, timeout=timeout, stream=True) as r, open(dest_file_path, "wb") as f:
diff --git a/lib/galaxy/util/compression_utils.py b/lib/galaxy/util/compression_utils.py
index 4fcc8adc6f4..5323c74126c 100644
--- a/lib/galaxy/util/compression_utils.py
+++ b/lib/galaxy/util/compression_utils.py
@@ -4,6 +4,7 @@ import io
 import logging
 import os
 import tarfile
+import tempfile
 import zipfile
 from typing import (
     Any,
@@ -152,6 +153,19 @@ def file_iter(fname: str, sep: Optional[Any] = None) -> Generator[Union[List[byt
 ArchiveMemberType = Union[tarfile.TarInfo, zipfile.ZipInfo]
 
 
+def decompress_bytes_to_directory(content: bytes) -> str:
+    temp_directory = tempfile.mkdtemp()
+    with tempfile.NamedTemporaryFile(delete=False) as fp:
+        fp.write(content)
+        fp.close()
+        return CompressedFile(fp.name).extract(temp_directory)
+
+
+def decompress_path_to_directory(path: str) -> str:
+    temp_directory = tempfile.mkdtemp()
+    return CompressedFile(path).extract(temp_directory)
+
+
 class CompressedFile:
 
     archive: Union[tarfile.TarFile, zipfile.ZipFile]
diff --git a/lib/galaxy/util/drs.py b/lib/galaxy/util/drs.py
new file mode 100644
index 00000000000..bde66774788
--- /dev/null
+++ b/lib/galaxy/util/drs.py
@@ -0,0 +1,105 @@
+import time
+from os import PathLike
+from typing import (
+    Optional,
+    Union,
+)
+
+import requests
+
+from galaxy.util import (
+    CHUNK_SIZE,
+    DEFAULT_SOCKET_TIMEOUT,
+)
+
+TargetPathT = Union[str, PathLike]
+
+
+def _not_implemented(drs_uri: str, desc: str) -> NotImplementedError:
+    missing_client_func = f"Galaxy client cannot currently fetch URIs {desc}."
+    header = f"Missing client functionaltiy required to fetch DRS URI {drs_uri}."
+    rest_of_message = """Currently Galaxy client only works with HTTP/HTTPS targets but extensions for
+    other types would be gladly welcomed by the Galaxy team. Please
+    report use cases not covered by this function to our issue tracker
+    at https://github.com/galaxyproject/galaxy/issues/new.
+    """
+    return NotImplementedError(f"{header} {missing_client_func} {rest_of_message}")
+
+
+class RetryOptions:
+    retry_times: int = 5
+    override_retry_after: Optional[float] = None
+
+
+def retry_and_get(get_url: str, retry_options: RetryOptions) -> requests.Response:
+    response = requests.get(get_url, timeout=DEFAULT_SOCKET_TIMEOUT)
+    response.raise_for_status()
+    if response.status_code == 202:
+        if retry_options.retry_times == 0:
+            raise Exception("Timeout waiting on DRS URI response")
+        if "Retry-After" not in response.headers:
+            raise ValueError("Remote DRS URI response invalid (Retry-After must be specified for 202 statuses)")
+        retry_after = retry_options.override_retry_after or float(response.headers["Retry-After"])
+        time.sleep(retry_after)
+        retry_options.retry_times -= 1
+        return retry_and_get(get_url, retry_options)
+    else:
+        return response
+
+
+def fetch_drs_to_file(
+    drs_uri: str, target_path: TargetPathT, force_http=False, retry_options: Optional[RetryOptions] = None
+):
+    """Fetch contents of drs:// URI to a target path."""
+    if not drs_uri.startswith("drs://"):
+        raise ValueError(f"Unknown scheme for drs_uri {drs_uri}")
+    rest_of_drs_uri = drs_uri[len("drs://") :]
+    if "/" not in rest_of_drs_uri:
+        # DRS URI uses compact identifiers, not yet implemented.
+        # https://ga4gh.github.io/data-repository-service-schemas/preview/release/drs-1.2.0/docs/more-background-on-compact-identifiers.html
+        raise _not_implemented(drs_uri, "that use compact identifiers")
+    netspec, object_id = rest_of_drs_uri.split("/", 1)
+    scheme = "https"
+    if force_http:
+        scheme = "http"
+    get_url = f"{scheme}://{netspec}/ga4gh/drs/v1/objects/{object_id}"
+    response = retry_and_get(get_url, retry_options or RetryOptions())
+    response.raise_for_status()
+    response_object = response.json()
+    if "access_methods" not in response_object:
+        raise ValueError(f"No access methods found in DRS response for {drs_uri}")
+    access_methods = response_object["access_methods"]
+    if len(access_methods) == 0:
+        raise ValueError(f"No access methods found in DRS response for {drs_uri}")
+
+    filtered_access_methods = [m for m in access_methods if m["type"].startswith("http")]
+    if len(filtered_access_methods) == 0:
+        unimplemented_access_types = [m["type"] for m in access_methods]
+        raise _not_implemented(drs_uri, f"that is fetched via unimplemented types ({unimplemented_access_types})")
+
+    access_method = filtered_access_methods[0]
+    try:
+        access_url = access_method["access_url"]
+    except KeyError:
+        access_id = access_method["access_id"]
+        access_get_url = f"{get_url}/access/{access_id}"
+        access_response = requests.get(access_get_url, timeout=DEFAULT_SOCKET_TIMEOUT)
+        access_response.raise_for_status()
+        access_response_object = access_response.json()
+        access_url = access_response_object
+
+    url = access_url["url"]
+    headers_list = access_url.get("headers") or []
+    headers_as_dict = {}
+    for header_str in headers_list:
+        key, value = header_str.split(": ", 1)
+        headers_as_dict[key] = value
+
+    download_response = requests.get(url, headers=headers_as_dict, stream=True, timeout=DEFAULT_SOCKET_TIMEOUT)
+    download_response.raise_for_status()
+    with open(target_path, "wb") as f:
+        for chunk in download_response.iter_content(chunk_size=CHUNK_SIZE):
+            # If you have chunk encoded response uncomment if
+            # and set chunk_size parameter to None.
+            # if chunk:
+            f.write(chunk)
diff --git a/lib/galaxy/util/json.py b/lib/galaxy/util/json.py
index a6980f94036..1b3d03f6c47 100644
--- a/lib/galaxy/util/json.py
+++ b/lib/galaxy/util/json.py
@@ -11,7 +11,7 @@ from collections.abc import (
 )
 from decimal import Decimal
 
-from ..util import unicodify
+from . import unicodify
 
 __all__ = ("safe_dumps", "validate_jsonrpc_request", "validate_jsonrpc_response", "jsonrpc_request", "jsonrpc_response")
 
diff --git a/lib/galaxy/util/jstree.py b/lib/galaxy/util/jstree.py
index 2dfb1869522..a2f2fed4b84 100644
--- a/lib/galaxy/util/jstree.py
+++ b/lib/galaxy/util/jstree.py
@@ -4,151 +4,149 @@ from collections import namedtuple
 
 import dictobj
 
-Path = namedtuple('Path', ('path', 'id', 'options'))
+Path = namedtuple("Path", ("path", "id", "options"))
 
 
 class Node(dictobj.DictionaryObject):
-  """
-  Copyright 2012 "Grim Apps"
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-  Helper class written by William Grim - grimwm
-  Original repo: https://github.com/grimwm/py-jstree
-  Code adjusted according to the idea of Frank Blechschmidt - FraBle
-  Thank you!
-  ************************
-  This class exists as a helper to the JSTree.  Its "jsonData" method can
-  generate sub-tree JSON without putting the logic directly into the JSTree.
-
-  This data structure is only semi-immutable.  The JSTree uses a directly
-  iterative (i.e. no stack is managed) builder pattern to construct a
-  tree out of paths.  Therefore, the children are not known in advance, and
-  we have to keep the children attribute mutable.
-  """
-
-  def __init__(self, path, oid, **kwargs):
     """
-    kwargs allows users to pass arbitrary information into a Node that
-    will later be output in jsonData().  It allows for more advanced
-    configuration than the default path handling that JSTree currently allows.
-    For example, users may want to pass "attr" or some other valid jsTree options.
+    Copyright 2012 "Grim Apps"
 
-    Example:
-      >>> node = Node('a', None)
-      >>> assert node._items == {'text': 'a', 'children': dictobj.MutableDictionaryObject({})}
-      >>> assert node.jsonData() == {'text': 'a'}
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
 
-      >>> node = Node('a', 1)
-      >>> assert node._items == {'text': 'a', 'children': dictobj.MutableDictionaryObject({}), 'li_attr': dictobj.DictionaryObject({'id': 1}), 'id': 1}
-      >>> assert node.jsonData() == {'text': 'a', 'id': 1, 'li_attr': {'id': 1}}
+         http://www.apache.org/licenses/LICENSE-2.0
 
-      >>> node = Node('a', 5, icon="folder", state = {'opened': True})
-      >>> assert node._items == {'text': 'a', 'id': 5, 'state': dictobj.DictionaryObject({'opened': True}), 'children': dictobj.MutableDictionaryObject({}), 'li_attr': dictobj.DictionaryObject({'id': 5}), 'icon': 'folder'}
-      >>> assert node.jsonData() == {'text': 'a', 'state': {'opened': True}, 'id': 5, 'li_attr': {'id': 5}, 'icon': 'folder'}
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+
+    Helper class written by William Grim - grimwm
+    Original repo: https://github.com/grimwm/py-jstree
+    Code adjusted according to the idea of Frank Blechschmidt - FraBle
+    Thank you!
+    ************************
+    This class exists as a helper to the JSTree.  Its "jsonData" method can
+    generate sub-tree JSON without putting the logic directly into the JSTree.
+
+    This data structure is only semi-immutable.  The JSTree uses a directly
+    iterative (i.e. no stack is managed) builder pattern to construct a
+    tree out of paths.  Therefore, the children are not known in advance, and
+    we have to keep the children attribute mutable.
     """
-    super().__init__()
 
-    children = kwargs.get('children', {})
-    if len([key for key in children if not isinstance(children[key], Node)]):
-      raise TypeError(
-        f"One or more children were not instances of '{Node.__name__}'")
-    if 'children' in kwargs:
-      del kwargs['children']
-    self._items['children'] = dictobj.MutableDictionaryObject(children)
+    def __init__(self, path, oid, **kwargs):
+        """
+        kwargs allows users to pass arbitrary information into a Node that
+        will later be output in jsonData().  It allows for more advanced
+        configuration than the default path handling that JSTree currently allows.
+        For example, users may want to pass "attr" or some other valid jsTree options.
 
-    if oid is not None:
-      li_attr = kwargs.get('li_attr', {})
-      li_attr['id'] = oid
-      kwargs['li_attr'] = li_attr
-      self._items['id'] = oid
+        Example:
+          >>> node = Node('a', None)
+          >>> assert node._items == {'text': 'a', 'children': dictobj.MutableDictionaryObject({})}
+          >>> assert node.jsonData() == {'text': 'a'}
 
-    self._items.update(dictobj.DictionaryObject(**kwargs))
-    self._items['text'] = path
+          >>> node = Node('a', 1)
+          >>> assert node._items == {'text': 'a', 'children': dictobj.MutableDictionaryObject({}), 'li_attr': dictobj.DictionaryObject({'id': 1}), 'id': 1}
+          >>> assert node.jsonData() == {'text': 'a', 'id': 1, 'li_attr': {'id': 1}}
 
-  def jsonData(self):
-    children = [self.children[k].jsonData() for k in sorted(self.children)]
-    output = {}
-    for k in self._items:
-      if 'children' == k:
-        continue
-      if isinstance(self._items[k], dictobj.DictionaryObject):
-        output[k] = self._items[k].asdict()
-      else:
-        output[k] = self._items[k]
-    if len(children):
-      output['children'] = children
-    return output
+          >>> node = Node('a', 5, icon="folder", state = {'opened': True})
+          >>> assert node._items == {'text': 'a', 'id': 5, 'state': dictobj.DictionaryObject({'opened': True}), 'children': dictobj.MutableDictionaryObject({}), 'li_attr': dictobj.DictionaryObject({'id': 5}), 'icon': 'folder'}
+          >>> assert node.jsonData() == {'text': 'a', 'state': {'opened': True}, 'id': 5, 'li_attr': {'id': 5}, 'icon': 'folder'}
+        """
+        super().__init__()
+
+        children = kwargs.get("children", {})
+        if len([key for key in children if not isinstance(children[key], Node)]):
+            raise TypeError(f"One or more children were not instances of '{Node.__name__}'")
+        if "children" in kwargs:
+            del kwargs["children"]
+        self._items["children"] = dictobj.MutableDictionaryObject(children)
+
+        if oid is not None:
+            li_attr = kwargs.get("li_attr", {})
+            li_attr["id"] = oid
+            kwargs["li_attr"] = li_attr
+            self._items["id"] = oid
+
+        self._items.update(dictobj.DictionaryObject(**kwargs))
+        self._items["text"] = path
+
+    def jsonData(self):
+        children = [self.children[k].jsonData() for k in sorted(self.children)]
+        output = {}
+        for k in self._items:
+            if "children" == k:
+                continue
+            if isinstance(self._items[k], dictobj.DictionaryObject):
+                output[k] = self._items[k].asdict()
+            else:
+                output[k] = self._items[k]
+        if len(children):
+            output["children"] = children
+        return output
 
 
 class JSTree(dictobj.DictionaryObject):
-  """
-  An immutable dictionary-like object that converts a list of "paths"
-  into a tree structure suitable for jQuery's jsTree.
-  """
-
-  def __init__(self, paths, **kwargs):
     """
-    Take a list of paths and put them into a tree.  Paths with the same prefix should
-    be at the same level in the tree.
-
-    kwargs may be standard jsTree options used at all levels in the tree.  These will be outputted
-    in the JSON.
-
+    An immutable dictionary-like object that converts a list of "paths"
+    into a tree structure suitable for jQuery's jsTree.
     """
-    if len([p for p in paths if not isinstance(p, Path)]):
-      raise TypeError(
-        f"All paths must be instances of '{Path.__name__}'")
 
-    super().__init__()
+    def __init__(self, paths, **kwargs):
+        """
+        Take a list of paths and put them into a tree.  Paths with the same prefix should
+        be at the same level in the tree.
 
-    root = Node('', None, **kwargs)
-    for path in sorted(paths):
-      curr = root
-      subpaths = path.path.split(os.path.sep)
-      for i, subpath in enumerate(subpaths):
-        if subpath not in curr.children:
-          opt = copy.deepcopy(kwargs)
-          if len(subpaths) - 1 == i:
-            oid = path.id
-            opt.update(path.options) if path.options is not None else None
-          else:
-            oid = None
-          curr.children[subpath] = Node(subpath, oid, **opt)
-          # oid = path.id if len(subpaths) - 1 == i else None
-          # curr.children[subpath] = Node(subpath, oid, **kwargs)
-        curr = curr.children[subpath]
-    self._items['_root'] = root
+        kwargs may be standard jsTree options used at all levels in the tree.  These will be outputted
+        in the JSON.
 
-  def pretty(self, root=None, depth=0, spacing=2):
-    """
-    Create a "pretty print" represenation of the tree with customized indentation at each
-    level of the tree.
-    """
-    if root is None:
-      root = self._root
-    fmt = "%s%s/" if root.children else "%s%s"
-    s = fmt % (" " * depth * spacing, root.text)
-    for child in root.children:
-      child = root.children[child]
-      s += f"\n{self.pretty(child, depth + 1, spacing)}"
-    return s
+        """
+        if len([p for p in paths if not isinstance(p, Path)]):
+            raise TypeError(f"All paths must be instances of '{Path.__name__}'")
 
-  def jsonData(self):
-    """
-    Returns a copy of the internal tree in a JSON-friendly format,
-    ready for consumption by jsTree.  The data is represented as a
-    list of dictionaries, each of which are our internal nodes.
+        super().__init__()
 
-    """
-    return [self._root.children[k].jsonData() for k in sorted(self._root.children)]
+        root = Node("", None, **kwargs)
+        for path in sorted(paths):
+            curr = root
+            subpaths = path.path.split(os.path.sep)
+            for i, subpath in enumerate(subpaths):
+                if subpath not in curr.children:
+                    opt = copy.deepcopy(kwargs)
+                    if len(subpaths) - 1 == i:
+                        oid = path.id
+                        opt.update(path.options) if path.options is not None else None
+                    else:
+                        oid = None
+                    curr.children[subpath] = Node(subpath, oid, **opt)
+                    # oid = path.id if len(subpaths) - 1 == i else None
+                    # curr.children[subpath] = Node(subpath, oid, **kwargs)
+                curr = curr.children[subpath]
+        self._items["_root"] = root
+
+    def pretty(self, root=None, depth=0, spacing=2):
+        """
+        Create a "pretty print" represenation of the tree with customized indentation at each
+        level of the tree.
+        """
+        if root is None:
+            root = self._root
+        fmt = "%s%s/" if root.children else "%s%s"
+        s = fmt % (" " * depth * spacing, root.text)
+        for child in root.children:
+            child = root.children[child]
+            s += f"\n{self.pretty(child, depth + 1, spacing)}"
+        return s
+
+    def jsonData(self):
+        """
+        Returns a copy of the internal tree in a JSON-friendly format,
+        ready for consumption by jsTree.  The data is represented as a
+        list of dictionaries, each of which are our internal nodes.
+
+        """
+        return [self._root.children[k].jsonData() for k in sorted(self._root.children)]
diff --git a/lib/galaxy/util/rules_dsl.py b/lib/galaxy/util/rules_dsl.py
index f58762a1637..c672b1d30b0 100644
--- a/lib/galaxy/util/rules_dsl.py
+++ b/lib/galaxy/util/rules_dsl.py
@@ -61,7 +61,8 @@ def apply_regex(regex, target, data, replacement=None, group_count=None):
 
 
 class BaseRuleDefinition(metaclass=abc.ABCMeta):
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def rule_type(self):
         """Short string describing type of rule (plugin class) to use."""
 
diff --git a/lib/galaxy/util/themes.py b/lib/galaxy/util/themes.py
new file mode 100644
index 00000000000..ba9901d62d3
--- /dev/null
+++ b/lib/galaxy/util/themes.py
@@ -0,0 +1,20 @@
+from typing import (
+    Dict,
+    Union,
+)
+
+Theme = Dict[str, Union["Theme", str]]
+
+
+def flatten_theme(theme: Theme, prefix: str = "-") -> Dict[str, str]:
+    """Transforms a nested theme dictionary into a flat dictionary,
+    containing keys compatible with css variables. e.g. '--masthead-background-color'"""
+    flat_attributes: Dict[str, str] = {}
+
+    for key, val in theme.items():
+        if isinstance(val, str):
+            flat_attributes[f"{prefix}-{key}"] = val
+        elif isinstance(val, Dict):
+            flat_attributes.update(flatten_theme(val, f"{prefix}-{key}"))
+
+    return flat_attributes
diff --git a/lib/galaxy/util/xml_macros.py b/lib/galaxy/util/xml_macros.py
index 392b30a3958..9bfe45546a7 100644
--- a/lib/galaxy/util/xml_macros.py
+++ b/lib/galaxy/util/xml_macros.py
@@ -131,14 +131,14 @@ def _expand_tokens_for_el(element, tokens):
     value = element.text
     if value:
         new_value = _expand_tokens_str(element.text, tokens)
-        if not (new_value is value):
+        if new_value is not value:
             element.text = new_value
     for key, value in element.attrib.items():
         new_value = _expand_tokens_str(value, tokens)
-        if not (new_value is value):
+        if new_value is not value:
             element.attrib[key] = new_value
         new_key = _expand_tokens_str(key, tokens)
-        if not (new_key is key):
+        if new_key is not key:
             element.attrib[new_key] = element.attrib[key]
             del element.attrib[key]
     # recursively expand in childrens
diff --git a/lib/galaxy/web/framework/decorators.py b/lib/galaxy/web/framework/decorators.py
index 8176277a4fb..0792d2e3f91 100644
--- a/lib/galaxy/web/framework/decorators.py
+++ b/lib/galaxy/web/framework/decorators.py
@@ -381,7 +381,7 @@ def format_return_as_json(rval, jsonp_callback=None, pretty=False):
     return json
 
 
-def validation_error_to_message_exception(e):
+def validation_error_to_message_exception(e: ValidationError) -> MessageException:
     invalid_found = False
     missing_found = False
     for error in e.errors():
diff --git a/lib/galaxy/web/framework/middleware/xforwardedhost.py b/lib/galaxy/web/framework/middleware/xforwardedhost.py
index 8542a804eec..3e0e1195863 100644
--- a/lib/galaxy/web/framework/middleware/xforwardedhost.py
+++ b/lib/galaxy/web/framework/middleware/xforwardedhost.py
@@ -15,8 +15,11 @@ class XForwardedHostMiddleware:
         x_forwarded_for = environ.get("HTTP_X_FORWARDED_FOR", None)
         if x_forwarded_for:
             environ["ORGINAL_REMOTE_ADDR"] = environ["REMOTE_ADDR"]
-            environ["REMOTE_ADDR"] = x_forwarded_for.split(", ", 1)[0]
-        x_url_scheme = environ.get("HTTP_X_URL_SCHEME", None)
+            environ["REMOTE_ADDR"] = x_forwarded_for.split(",", 1)[0].strip()
+        x_forwarded_proto = environ.get("HTTP_X_FORWARDED_PROTO", None)
+        if x_forwarded_proto:
+            x_forwarded_proto = x_forwarded_proto.split(",", 1)[0].strip()
+        x_url_scheme = environ.get("HTTP_X_URL_SCHEME", x_forwarded_proto)
         if x_url_scheme:
             environ["original_wsgi.url_scheme"] = environ["wsgi.url_scheme"]
             environ["wsgi.url_scheme"] = x_url_scheme
diff --git a/lib/galaxy/web/short_term_storage/__init__.py b/lib/galaxy/web/short_term_storage/__init__.py
index 0dc8a15fc52..abd354294d9 100644
--- a/lib/galaxy/web/short_term_storage/__init__.py
+++ b/lib/galaxy/web/short_term_storage/__init__.py
@@ -24,6 +24,7 @@ from galaxy.exceptions import (
     ObjectNotFound,
 )
 from galaxy.exceptions.error_codes import error_codes_by_int_code
+from galaxy.schema.schema import OptionalNumberT
 from galaxy.util import (
     directory_hash_id,
     is_uuid,
@@ -35,9 +36,6 @@ now = datetime.utcnow
 DEFAULT_STORAGE_DURATION = 24 * 60 * 60  # store for a day by default
 
 
-OptionalNumberT = Optional[Union[int, float]]
-
-
 @dataclass
 class ShortTermStorageConfiguration:
     short_term_storage_directory: str
@@ -68,6 +66,7 @@ class ShortTermStorageTargetSecurity:
 class ShortTermStorageTarget:
     request_id: UUID
     raw_path: str
+    duration: OptionalNumberT = None
 
     @property
     def path(self):
@@ -167,12 +166,14 @@ class ShortTermStorageManager(ShortTermStorageAllocator, ShortTermStorageMonitor
             security = ShortTermStorageTargetSecurity()
         request_id = uuid4()
         target_directory = self._directory(request_id)
-        target = ShortTermStorageTarget(request_id=request_id, raw_path=str(target_directory / "target"))
-        safe_makedirs(target_directory)
         duration = duration or self._config.default_storage_duration or DEFAULT_STORAGE_DURATION
         maximum_storage_duration = self._config.maximum_storage_duration
         if duration and maximum_storage_duration and duration > maximum_storage_duration:
             duration = maximum_storage_duration
+        target = ShortTermStorageTarget(
+            request_id=request_id, raw_path=str(target_directory / "target"), duration=duration
+        )
+        safe_makedirs(target_directory)
         # optimize by placing the deletion time outside JSON as new file...
         request_info = {
             "filename": filename,
diff --git a/lib/galaxy/webapps/base/api.py b/lib/galaxy/webapps/base/api.py
index bc39cca60c2..d87e2224593 100644
--- a/lib/galaxy/webapps/base/api.py
+++ b/lib/galaxy/webapps/base/api.py
@@ -152,17 +152,33 @@ class GalaxyFileResponse(FileResponse):
             await self.background()
 
 
+def get_error_response_for_request(request: Request, exc: MessageException) -> JSONResponse:
+    error_dict = api_error_message(None, exception=exc)
+    status_code = exc.status_code
+    path = request.url.path
+    if "ga4gh" in path:
+        # When serving GA4GH APIs use limited exceptions to conform their expected
+        # error schema. Tailored to DRS currently.
+        content = {"status_code": status_code, "msg": error_dict["err_msg"]}
+    else:
+        content = error_dict
+
+    retry_after: typing.Optional[int] = getattr(exc, "retry_after", None)
+    headers: typing.Dict[str, str] = {}
+    if retry_after:
+        headers["Retry-After"] = str(retry_after)
+    return JSONResponse(status_code=status_code, content=content, headers=headers)
+
+
 def add_exception_handler(app: FastAPI) -> None:
     @app.exception_handler(RequestValidationError)
     async def validate_exception_middleware(request: Request, exc: RequestValidationError) -> Response:
-        exc = validation_error_to_message_exception(exc)
-        error_dict = api_error_message(None, exception=exc)
-        return JSONResponse(status_code=400, content=error_dict)
+        message_exception = validation_error_to_message_exception(exc)
+        return get_error_response_for_request(request, message_exception)
 
     @app.exception_handler(MessageException)
     async def message_exception_middleware(request: Request, exc: MessageException) -> Response:
-        error_dict = api_error_message(None, exception=exc)
-        return JSONResponse(status_code=exc.status_code, content=error_dict)
+        return get_error_response_for_request(request, exc)
 
 
 def add_request_id_middleware(app: FastAPI):
diff --git a/lib/galaxy/webapps/galaxy/api/__init__.py b/lib/galaxy/webapps/galaxy/api/__init__.py
index d1d998f4828..84e88aa0468 100644
--- a/lib/galaxy/webapps/galaxy/api/__init__.py
+++ b/lib/galaxy/webapps/galaxy/api/__init__.py
@@ -452,7 +452,7 @@ If the tag is quoted, the attribute will be filtered exactly. If the tag is unqu
 generally a partial match will be used to filter the query (i.e. in terms of the implementation
 this means the database operation `ILIKE` will typically be used).
 
-Once the tagged filters are extracted from the search query, the remaing text is just
+Once the tagged filters are extracted from the search query, the remaining text is just
 used to search various documented attributes of the object.
 
 ## GitHub-style Tags Available
diff --git a/lib/galaxy/webapps/galaxy/api/authenticate.py b/lib/galaxy/webapps/galaxy/api/authenticate.py
index ed8c9898a8d..8c5a7d5b780 100644
--- a/lib/galaxy/webapps/galaxy/api/authenticate.py
+++ b/lib/galaxy/webapps/galaxy/api/authenticate.py
@@ -15,6 +15,8 @@ Returns
     }
 
 """
+from fastapi import Request
+
 from galaxy.web import expose_api_anonymous_and_sessionless
 from galaxy.webapps.base.webapp import GalaxyWebTransaction
 from galaxy.webapps.galaxy.services.authenticate import (
@@ -24,8 +26,11 @@ from galaxy.webapps.galaxy.services.authenticate import (
 from . import (
     BaseGalaxyAPIController,
     depends,
+    Router,
 )
 
+router = Router(tags=["authenticate"])
+
 
 class AuthenticationController(BaseGalaxyAPIController):
     authentication_service = depends(AuthenticationService)
@@ -44,15 +49,16 @@ class AuthenticationController(BaseGalaxyAPIController):
         # When this is actually granular, endpoints should *probably* respond appropriately.
         # trans.response.headers['Access-Control-Allow-Methods'] = 'POST, PUT, GET, OPTIONS, DELETE'
 
-    @expose_api_anonymous_and_sessionless
-    def get_api_key(self, trans: GalaxyWebTransaction, **kwd) -> APIKeyResponse:
-        """
-        GET /api/authenticate/baseauth
-          returns an API key for authenticated user based on BaseAuth headers
 
-        :returns: api_key in json format
-        :rtype:   dict
+@router.cbv
+class FastAPIAuthenticate:
+    authentication_service: AuthenticationService = depends(AuthenticationService)
 
-        :raises: ObjectNotFound, HTTPBadRequest
-        """
-        return self.authentication_service.get_api_key(trans.environ, trans.request)
+    @router.get(
+        "/api/authenticate/baseauth",
+        summary="Returns returns an API key for authenticated user based on BaseAuth headers.",
+    )
+    def get_api_key(self, request: Request) -> APIKeyResponse:
+        authorization = request.headers.get("Authorization")
+        auth = {"HTTP_AUTHORIZATION": authorization}
+        return self.authentication_service.get_api_key(auth, request)
diff --git a/lib/galaxy/webapps/galaxy/api/common.py b/lib/galaxy/webapps/galaxy/api/common.py
index b74daf0d70c..7764a7aa4aa 100644
--- a/lib/galaxy/webapps/galaxy/api/common.py
+++ b/lib/galaxy/webapps/galaxy/api/common.py
@@ -46,6 +46,20 @@ FilterValueQueryParam: Optional[List[str]] = Query(
     example="2015-01-29",
 )
 
+OffsetQueryParam: Optional[int] = Query(
+    default=0,
+    ge=0,
+    title="Offset",
+    description="Starts at the beginning skip the first ( offset - 1 ) items and begin returning at the Nth item",
+)
+
+LimitQueryParam: Optional[int] = Query(
+    default=None,
+    ge=1,
+    title="Limit",
+    description="The maximum number of items to return.",
+)
+
 
 def parse_serialization_params(
     view: Optional[str] = None,
@@ -83,18 +97,8 @@ def get_value_filter_query_params(
 def get_filter_query_params(
     q: Optional[List[str]] = FilterQueryQueryParam,
     qv: Optional[List[str]] = FilterValueQueryParam,
-    offset: Optional[int] = Query(
-        default=0,
-        ge=0,
-        title="Offset",
-        description="Starts at the beginning skip the first ( offset - 1 ) items and begin returning at the Nth item",
-    ),
-    limit: Optional[int] = Query(
-        default=None,
-        ge=1,
-        title="Limit",
-        description="The maximum number of items to return.",
-    ),
+    offset: Optional[int] = OffsetQueryParam,
+    limit: Optional[int] = LimitQueryParam,
     order: Optional[str] = Query(
         default=None,
         title="Order",
diff --git a/lib/galaxy/webapps/galaxy/api/datasets.py b/lib/galaxy/webapps/galaxy/api/datasets.py
index 69c494842a5..6efb453f51e 100644
--- a/lib/galaxy/webapps/galaxy/api/datasets.py
+++ b/lib/galaxy/webapps/galaxy/api/datasets.py
@@ -88,7 +88,7 @@ class FastAPIDatasets:
         trans=DependsOnTrans,
         history_id: Optional[DecodedDatabaseIdField] = Query(
             default=None,
-            description="Optional identifier of a History. Use it to restrict the search whithin a particular History.",
+            description="Optional identifier of a History. Use it to restrict the search within a particular History.",
         ),
         serialization_params: SerializationParams = Depends(query_serialization_params),
         filter_query_params: FilterQueryParams = Depends(get_filter_query_params),
@@ -260,7 +260,7 @@ class FastAPIDatasets:
         """Streams the dataset for download or the contents preview to be displayed in a browser."""
         extra_params = get_query_parameters_from_request_excluding(request, {"preview", "filename", "to_ext", "raw"})
         display_data, headers = self.service.display(
-            trans, history_content_id, preview, filename, to_ext, raw, **extra_params
+            trans, history_content_id, preview=preview, filename=filename, to_ext=to_ext, raw=raw, **extra_params
         )
         if isinstance(display_data, IOBase):
             file_name = getattr(display_data, "name", None)
diff --git a/lib/galaxy/webapps/galaxy/api/drs.py b/lib/galaxy/webapps/galaxy/api/drs.py
new file mode 100644
index 00000000000..70ec8238496
--- /dev/null
+++ b/lib/galaxy/webapps/galaxy/api/drs.py
@@ -0,0 +1,111 @@
+"""Implement a DRS server for Galaxy dataset objects (experimental)."""
+import logging
+from io import IOBase
+from typing import cast
+
+from fastapi import (
+    Path,
+    Request,
+)
+from starlette.responses import FileResponse
+
+from galaxy.config import GalaxyAppConfiguration
+from galaxy.exceptions import ObjectNotFound
+from galaxy.managers.context import ProvidesHistoryContext
+from galaxy.schema.drs import (
+    DrsObject,
+    Service,
+    ServiceOrganization,
+    ServiceType,
+)
+from galaxy.schema.fields import DecodedDatabaseIdField
+from galaxy.version import VERSION
+from galaxy.webapps.galaxy.services.datasets import DatasetsService
+from . import (
+    depends,
+    DependsOnTrans,
+    Router,
+)
+
+log = logging.getLogger(__name__)
+router = Router(tags=["drs"])
+ObjectIDParam: str = Path(..., title="Object ID", description="The ID of the group")
+AccessIDParam: str = Path(
+    ..., title="Access ID", description="The access ID of the access method for objects, unused in Galaxy."
+)
+
+DRS_SERVICE_NAME = "Galaxy DRS API"
+DRS_SERVICE_DESCRIPTION = "Serves Galaxy datasets according to the GA4GH DRS specification"
+
+
+@router.cbv
+class DrsApi:
+    service: DatasetsService = depends(DatasetsService)
+    config: GalaxyAppConfiguration = depends(GalaxyAppConfiguration)
+
+    @router.get("/ga4gh/drs/v1/service-info")
+    def service_info(self, request: Request) -> Service:
+        components = request.url.components
+        hostname = components.hostname
+        assert hostname
+        default_organization_id = ".".join(reversed(hostname.split(".")))
+        config = self.config
+        organization_id = config.ga4gh_service_id or default_organization_id
+        organization_name = config.ga4gh_service_organization_name or organization_id
+        organization_url = config.ga4gh_service_organization_url or f"{components.scheme}://{components.netloc}"
+
+        organization = ServiceOrganization(
+            url=organization_url,
+            name=organization_name,
+        )
+        service_type = ServiceType(
+            group="org.ga4gh",
+            artifact="drs",
+            version="1.2.0",
+        )
+        environment = config.ga4gh_service_environment
+        extra_kwds = {}
+        if environment:
+            extra_kwds["environment"] = environment
+        return Service(
+            id=organization_id + ".drs",
+            name=DRS_SERVICE_NAME,
+            description=DRS_SERVICE_DESCRIPTION,
+            organization=organization,
+            type=service_type,
+            version=VERSION,
+            **extra_kwds,
+        )
+
+    @router.get("/ga4gh/drs/v1/objects/{object_id}")
+    @router.post("/ga4gh/drs/v1/objects/{object_id}")  # spec specifies both get and post should work.
+    def get_object(
+        self,
+        request: Request,
+        trans: ProvidesHistoryContext = DependsOnTrans,
+        object_id: str = ObjectIDParam,
+    ) -> DrsObject:
+        return self.service.get_drs_object(trans, object_id, request_url=request.url)
+
+    @router.get("/ga4gh/drs/v1/objects/{object_id}/access/{access_id}")
+    @router.post("/ga4gh/drs/v1/objects/{object_id}/access/{access_id}")
+    def get_access_url(
+        self,
+        request: Request,
+        trans: ProvidesHistoryContext = DependsOnTrans,
+        object_id: str = ObjectIDParam,
+        access_id: str = AccessIDParam,
+    ):
+        raise ObjectNotFound("Access IDs are not implemented for this DRS server")
+
+    @router.get(
+        "/api/drs_download/{object_id}",
+        response_class=FileResponse,
+    )
+    def download(self, trans: ProvidesHistoryContext = DependsOnTrans, object_id: str = ObjectIDParam):
+        decoded_object_id, hda_ldda = self.service.drs_dataset_instance(object_id)
+        display_data, headers = self.service.display(
+            trans, DecodedDatabaseIdField(decoded_object_id), hda_ldda=hda_ldda, filename=None, raw=True
+        )
+        data_io = cast(IOBase, display_data)
+        return FileResponse(getattr(data_io, "name", "unnamed_file"), headers=headers)
diff --git a/lib/galaxy/webapps/galaxy/api/group_roles.py b/lib/galaxy/webapps/galaxy/api/group_roles.py
index 412c2b77128..74422009ea8 100644
--- a/lib/galaxy/webapps/galaxy/api/group_roles.py
+++ b/lib/galaxy/webapps/galaxy/api/group_roles.py
@@ -31,7 +31,7 @@ RoleIDParam: DecodedDatabaseIdField = Path(..., title="RoleID", description="The
 def group_role_to_model(trans, group_id: int, role) -> GroupRoleModel:
     encoded_group_id = DecodedDatabaseIdField.encode(group_id)
     encoded_role_id = DecodedDatabaseIdField.encode(role.id)
-    url = trans.url_builder("group_role", group_id=encoded_group_id, id=encoded_role_id)
+    url = trans.url_builder("group_role", group_id=encoded_group_id, role_id=encoded_role_id)
     return GroupRoleModel.construct(id=encoded_role_id, name=role.name, url=url)
 
 
@@ -49,7 +49,7 @@ class FastAPIGroupRoles:
         )
 
     @router.get(
-        "/api/groups/{group_id}/roles/{id}",
+        "/api/groups/{group_id}/roles/{role_id}",
         name="group_role",
         require_admin=True,
         summary="Displays information about a group role.",
@@ -58,9 +58,9 @@ class FastAPIGroupRoles:
         self,
         trans: ProvidesAppContext = DependsOnTrans,
         group_id: DecodedDatabaseIdField = GroupIDParam,
-        id: DecodedDatabaseIdField = RoleIDParam,
+        role_id: DecodedDatabaseIdField = RoleIDParam,
     ) -> GroupRoleModel:
-        role = self.manager.show(trans, id, group_id)
+        role = self.manager.show(trans, role_id, group_id)
         return group_role_to_model(trans, group_id, role)
 
     @router.put("/api/groups/{group_id}/roles/{role_id}", require_admin=True, summary="Adds a role to a group")
diff --git a/lib/galaxy/webapps/galaxy/api/group_users.py b/lib/galaxy/webapps/galaxy/api/group_users.py
index 39b408696e7..36105f75d27 100644
--- a/lib/galaxy/webapps/galaxy/api/group_users.py
+++ b/lib/galaxy/webapps/galaxy/api/group_users.py
@@ -30,7 +30,7 @@ UserIDParam: DecodedDatabaseIdField = Path(..., title="UserID", description="The
 def group_user_to_model(trans, group_id, user):
     encoded_group_id = DecodedDatabaseIdField.encode(group_id)
     encoded_user_id = DecodedDatabaseIdField.encode(user.id)
-    url = trans.url_builder("group_user", group_id=encoded_group_id, id=encoded_user_id)
+    url = trans.url_builder("group_user", group_id=encoded_group_id, user_id=encoded_user_id)
     return GroupUserModel.construct(id=encoded_user_id, email=user.email, url=url)
 
 
@@ -50,8 +50,8 @@ class FastAPIGroupUsers:
         return GroupUserListModel(__root__=[group_user_to_model(trans, group_id, gr) for gr in group_users])
 
     @router.get(
-        "/api/groups/{group_id}/user/{id}",
-        alias="/api/groups/{group_id}/users/{id}",
+        "/api/groups/{group_id}/user/{user_id}",
+        alias="/api/groups/{group_id}/users/{user_id}",
         name="group_user",
         require_admin=True,
         summary="Displays information about a group user.",
@@ -60,13 +60,12 @@ class FastAPIGroupUsers:
         self,
         trans: ProvidesAppContext = DependsOnTrans,
         group_id: DecodedDatabaseIdField = GroupIDParam,
-        id: DecodedDatabaseIdField = UserIDParam,
+        user_id: DecodedDatabaseIdField = UserIDParam,
     ) -> GroupUserModel:
         """
-        GET /api/groups/{encoded_group_id}/users/{encoded_user_id}
         Displays information about a group user.
         """
-        user = self.manager.show(trans, id, group_id)
+        user = self.manager.show(trans, user_id, group_id)
         return group_user_to_model(trans, group_id, user)
 
     @router.put(
diff --git a/lib/galaxy/webapps/galaxy/api/histories.py b/lib/galaxy/webapps/galaxy/api/histories.py
index ef6f46287af..372ceade205 100644
--- a/lib/galaxy/webapps/galaxy/api/histories.py
+++ b/lib/galaxy/webapps/galaxy/api/histories.py
@@ -14,6 +14,7 @@ from typing import (
 from fastapi import (
     Body,
     Depends,
+    Header,
     Path,
     Query,
     Response,
@@ -39,8 +40,9 @@ from galaxy.schema.schema import (
     CreateHistoryPayload,
     CustomBuildsMetadataResponse,
     ExportHistoryArchivePayload,
+    ExportTaskListResponse,
     HistoryArchiveExportResult,
-    JobExportHistoryArchiveCollection,
+    JobExportHistoryArchiveListResponse,
     JobImportHistoryResponse,
     SetSlugPayload,
     ShareWithPayload,
@@ -60,6 +62,8 @@ from galaxy.webapps.galaxy.api import (
 )
 from galaxy.webapps.galaxy.api.common import (
     get_filter_query_params,
+    LimitQueryParam,
+    OffsetQueryParam,
     query_serialization_params,
 )
 from galaxy.webapps.galaxy.services.histories import HistoriesService
@@ -179,60 +183,60 @@ class FastAPIHistories:
         return self.service.show(trans, serialization_params)
 
     @router.get(
-        "/api/histories/{id}",
+        "/api/histories/{history_id}",
         name="history",
         summary="Returns the history with the given ID.",
     )
     def show(
         self,
         trans: ProvidesHistoryContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
         serialization_params: SerializationParams = Depends(query_serialization_params),
     ) -> AnyHistoryView:
-        return self.service.show(trans, serialization_params, id)
+        return self.service.show(trans, serialization_params, history_id)
 
     @router.post(
-        "/api/histories/{id}/prepare_store_download",
+        "/api/histories/{history_id}/prepare_store_download",
         summary="Return a short term storage token to monitor download of the history.",
     )
     def prepare_store_download(
         self,
         trans: ProvidesHistoryContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
         payload: StoreExportPayload = Body(...),
     ) -> AsyncFile:
         return self.service.prepare_download(
             trans,
-            id,
+            history_id,
             payload=payload,
         )
 
     @router.post(
-        "/api/histories/{id}/write_store",
+        "/api/histories/{history_id}/write_store",
         summary="Prepare history for export-style download and write to supplied URI.",
     )
     def write_store(
         self,
         trans: ProvidesHistoryContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
         payload: WriteStoreToPayload = Body(...),
     ) -> AsyncTaskResultSummary:
         return self.service.write_store(
             trans,
-            id,
+            history_id,
             payload=payload,
         )
 
     @router.get(
-        "/api/histories/{id}/citations",
+        "/api/histories/{history_id}/citations",
         summary="Return all the citations for the tools used to produce the datasets in the history.",
     )
     def citations(
         self,
         trans: ProvidesHistoryContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
     ) -> List[Any]:
-        return self.service.citations(trans, id)
+        return self.service.citations(trans, history_id)
 
     @router.post(
         "/api/histories",
@@ -257,48 +261,48 @@ class FastAPIHistories:
         return self.service.create(trans, payload, serialization_params)
 
     @router.delete(
-        "/api/histories/{id}",
+        "/api/histories/{history_id}",
         summary="Marks the history with the given ID as deleted.",
     )
     def delete(
         self,
         trans: ProvidesHistoryContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
         serialization_params: SerializationParams = Depends(query_serialization_params),
         purge: bool = Query(default=False),
         payload: Optional[DeleteHistoryPayload] = Body(default=None),
     ) -> AnyHistoryView:
         if payload:
             purge = payload.purge
-        return self.service.delete(trans, id, serialization_params, purge)
+        return self.service.delete(trans, history_id, serialization_params, purge)
 
     @router.post(
-        "/api/histories/deleted/{id}/undelete",
+        "/api/histories/deleted/{history_id}/undelete",
         summary="Restores a deleted history with the given ID (that hasn't been purged).",
     )
     def undelete(
         self,
         trans: ProvidesHistoryContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
         serialization_params: SerializationParams = Depends(query_serialization_params),
     ) -> AnyHistoryView:
-        return self.service.undelete(trans, id, serialization_params)
+        return self.service.undelete(trans, history_id, serialization_params)
 
     @router.put(
-        "/api/histories/{id}",
+        "/api/histories/{history_id}",
         summary="Updates the values for the history with the given ID.",
     )
     def update(
         self,
         trans: ProvidesHistoryContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
         payload: Any = Body(
             ...,
             description="Object containing any of the editable fields of the history.",
         ),
         serialization_params: SerializationParams = Depends(query_serialization_params),
     ) -> AnyHistoryView:
-        return self.service.update(trans, id, payload, serialization_params)
+        return self.service.update(trans, history_id, payload, serialization_params)
 
     @router.post(
         "/api/histories/from_store",
@@ -320,23 +324,48 @@ class FastAPIHistories:
         self,
         trans: ProvidesHistoryContext = DependsOnTrans,
         payload: CreateHistoryFromStore = Body(...),
-    ) -> AnyHistoryView:
+    ) -> AsyncTaskResultSummary:
         return self.service.create_from_store_async(trans, payload)
 
     @router.get(
-        "/api/histories/{id}/exports",
-        summary=("Get previous history exports (to links). Effectively returns serialized JEHA objects."),
+        "/api/histories/{history_id}/exports",
+        name="get_history_exports",
+        summary=("Get previous history exports."),
+        responses={
+            200: {
+                "description": "A list of history exports",
+                "content": {
+                    "application/json": {
+                        "schema": {"ref": "#/components/schemas/JobExportHistoryArchiveListResponse"},
+                    },
+                    ExportTaskListResponse.__accept_type__: {
+                        "schema": {"ref": "#/components/schemas/ExportTaskListResponse"},
+                    },
+                },
+            },
+        },
     )
     def index_exports(
         self,
         trans: ProvidesHistoryContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
-    ) -> JobExportHistoryArchiveCollection:
-        exports = self.service.index_exports(trans, id)
-        return JobExportHistoryArchiveCollection.construct(__root__=exports)
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
+        limit: Optional[int] = LimitQueryParam,
+        offset: Optional[int] = OffsetQueryParam,
+        accept: str = Header(default="application/json", include_in_schema=False),
+    ) -> Union[JobExportHistoryArchiveListResponse, ExportTaskListResponse]:
+        """
+        By default the legacy job-based history exports (jeha) are returned.
+
+        Change the `accept` content type header to return the new task-based history exports.
+        """
+        use_tasks = accept == ExportTaskListResponse.__accept_type__
+        exports = self.service.index_exports(trans, history_id, use_tasks, limit, offset)
+        if use_tasks:
+            return ExportTaskListResponse(__root__=exports)
+        return JobExportHistoryArchiveListResponse(__root__=exports)
 
     @router.put(  # PUT instead of POST because multiple requests should just result in one object being created.
-        "/api/histories/{id}/exports",
+        "/api/histories/{history_id}/exports",
         summary=("Start job (if needed) to create history export for corresponding history."),
         responses={
             200: {
@@ -346,12 +375,13 @@ class FastAPIHistories:
                 "description": "The exported archive file is not ready yet.",
             },
         },
+        deprecated=True,
     )
     def archive_export(
         self,
         response: Response,
         trans=DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
         payload: Optional[ExportHistoryArchivePayload] = Body(None),
     ) -> HistoryArchiveExportResult:
         """This will start a job to create a history export archive.
@@ -363,14 +393,17 @@ class FastAPIHistories:
         If the history will be exported to a `directory_uri`, instead of returning the download
         link information, the Job ID will be returned so it can be queried to determine when
         the file has been written.
+
+        **Deprecation notice**: Please use `/api/histories/{id}/prepare_store_download` or
+        `/api/histories/{id}/write_store` instead.
         """
-        export_result, ready = self.service.archive_export(trans, id, payload)
+        export_result, ready = self.service.archive_export(trans, history_id, payload)
         if not ready:
             response.status_code = status.HTTP_202_ACCEPTED
         return export_result
 
     @router.get(
-        "/api/histories/{id}/exports/{jeha_id}",
+        "/api/histories/{history_id}/exports/{jeha_id}",
         name="history_archive_download",
         summary=("If ready and available, return raw contents of exported history as a downloadable archive."),
         response_class=GalaxyFileResponse,
@@ -379,19 +412,23 @@ class FastAPIHistories:
                 "description": "The archive file containing the History.",
             }
         },
+        deprecated=True,
     )
     def archive_download(
         self,
         trans: ProvidesHistoryContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
         jeha_id: Union[DecodedDatabaseIdField, LatestLiteral] = JehaIDPathParam,
     ):
         """
         See ``PUT /api/histories/{id}/exports`` to initiate the creation
         of the history export - when ready, that route will return 200 status
         code (instead of 202) and this route can be used to download the archive.
+
+        **Deprecation notice**: Please use `/api/histories/{id}/prepare_store_download` or
+        `/api/histories/{id}/write_store` instead.
         """
-        jeha = self.service.get_ready_history_export(trans, id, jeha_id)
+        jeha = self.service.get_ready_history_export(trans, history_id, jeha_id)
         media_type = self.service.get_archive_media_type(jeha)
         file_path = self.service.get_archive_download_path(trans, jeha)
         return GalaxyFileResponse(
@@ -401,100 +438,100 @@ class FastAPIHistories:
         )
 
     @router.get(
-        "/api/histories/{id}/custom_builds_metadata",
+        "/api/histories/{history_id}/custom_builds_metadata",
         summary="Returns meta data for custom builds.",
     )
     def get_custom_builds_metadata(
         self,
         trans: ProvidesHistoryContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
     ) -> CustomBuildsMetadataResponse:
-        return self.service.get_custom_builds_metadata(trans, id)
+        return self.service.get_custom_builds_metadata(trans, history_id)
 
     @router.get(
-        "/api/histories/{id}/sharing",
+        "/api/histories/{history_id}/sharing",
         summary="Get the current sharing status of the given item.",
     )
     def sharing(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
     ) -> SharingStatus:
         """Return the sharing status of the item."""
-        return self.service.shareable_service.sharing(trans, id)
+        return self.service.shareable_service.sharing(trans, history_id)
 
     @router.put(
-        "/api/histories/{id}/enable_link_access",
+        "/api/histories/{history_id}/enable_link_access",
         summary="Makes this item accessible by a URL link.",
     )
     def enable_link_access(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
     ) -> SharingStatus:
         """Makes this item accessible by a URL link and return the current sharing status."""
-        return self.service.shareable_service.enable_link_access(trans, id)
+        return self.service.shareable_service.enable_link_access(trans, history_id)
 
     @router.put(
-        "/api/histories/{id}/disable_link_access",
+        "/api/histories/{history_id}/disable_link_access",
         summary="Makes this item inaccessible by a URL link.",
     )
     def disable_link_access(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
     ) -> SharingStatus:
         """Makes this item inaccessible by a URL link and return the current sharing status."""
-        return self.service.shareable_service.disable_link_access(trans, id)
+        return self.service.shareable_service.disable_link_access(trans, history_id)
 
     @router.put(
-        "/api/histories/{id}/publish",
+        "/api/histories/{history_id}/publish",
         summary="Makes this item public and accessible by a URL link.",
     )
     def publish(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
     ) -> SharingStatus:
         """Makes this item publicly available by a URL link and return the current sharing status."""
-        return self.service.shareable_service.publish(trans, id)
+        return self.service.shareable_service.publish(trans, history_id)
 
     @router.put(
-        "/api/histories/{id}/unpublish",
+        "/api/histories/{history_id}/unpublish",
         summary="Removes this item from the published list.",
     )
     def unpublish(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
     ) -> SharingStatus:
         """Removes this item from the published list and return the current sharing status."""
-        return self.service.shareable_service.unpublish(trans, id)
+        return self.service.shareable_service.unpublish(trans, history_id)
 
     @router.put(
-        "/api/histories/{id}/share_with_users",
+        "/api/histories/{history_id}/share_with_users",
         summary="Share this item with specific users.",
     )
     def share_with_users(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
         payload: ShareWithPayload = Body(...),
     ) -> ShareWithStatus:
         """Shares this item with specific users and return the current sharing status."""
-        return self.service.shareable_service.share_with_users(trans, id, payload)
+        return self.service.shareable_service.share_with_users(trans, history_id, payload)
 
     @router.put(
-        "/api/histories/{id}/slug",
+        "/api/histories/{history_id}/slug",
         summary="Set a new slug for this shared item.",
         status_code=status.HTTP_204_NO_CONTENT,
     )
     def set_slug(
         self,
         trans: ProvidesUserContext = DependsOnTrans,
-        id: DecodedDatabaseIdField = HistoryIDPathParam,
+        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
         payload: SetSlugPayload = Body(...),
     ):
         """Sets a new slug to access this item by URL. The new slug must be unique."""
-        self.service.shareable_service.set_slug(trans, id, payload)
+        self.service.shareable_service.set_slug(trans, history_id, payload)
         return Response(status_code=status.HTTP_204_NO_CONTENT)
diff --git a/lib/galaxy/webapps/galaxy/api/history_contents.py b/lib/galaxy/webapps/galaxy/api/history_contents.py
index 3cec18b0fe1..02f75a82ac8 100644
--- a/lib/galaxy/webapps/galaxy/api/history_contents.py
+++ b/lib/galaxy/webapps/galaxy/api/history_contents.py
@@ -2,13 +2,11 @@
 API operations on the contents of a history.
 """
 import logging
-from datetime import datetime
 from typing import (
     Any,
     Dict,
     List,
     Optional,
-    Set,
     Union,
 )
 
@@ -18,7 +16,6 @@ from fastapi import (
     Header,
     Path,
     Query,
-    Request,
 )
 from pydantic.error_wrappers import ValidationError
 from starlette import status
@@ -73,9 +70,7 @@ from galaxy.webapps.galaxy.api.common import (
 from galaxy.webapps.galaxy.services.history_contents import (
     CreateHistoryContentFromStore,
     CreateHistoryContentPayload,
-    DirectionOptions,
     HistoriesContentsService,
-    HistoryContentsFilterList,
     HistoryContentsIndexJobsSummaryParams,
     HistoryContentsIndexParams,
     LegacyHistoryContentsIndexParams,
@@ -300,35 +295,6 @@ def parse_index_jobs_summary_params(
     return HistoryContentsIndexJobsSummaryParams(ids=util.listify(ids), types=util.listify(types))
 
 
-def parse_content_filter_params(
-    params: Dict[str, Any],
-    exclude: Optional[Set[str]] = None,
-) -> HistoryContentsFilterList:
-    """Alternative way of parsing query parameter for filtering history contents.
-
-    Parses parameters like: ?[field]-[operator]=[value]
-        Example: ?update_time-gt=2015-01-29
-
-    Currently used by the `contents_near` endpoint. The `exclude` set can contain
-    names of parameters that will be ignored and not added to the filters.
-    """
-    DEFAULT_OP = "eq"
-    splitchar = "-"
-
-    exclude = exclude or set()
-    result = []
-    for key, val in params.items():
-        if key in exclude:
-            continue
-        attr = key
-        op = DEFAULT_OP
-        if splitchar in key:
-            attr, op = key.rsplit(splitchar, 1)
-        result.append([attr, op, val])
-
-    return result
-
-
 @router.cbv
 class FastAPIHistoryContents:
     service: HistoriesContentsService = depends(HistoriesContentsService)
@@ -545,22 +511,22 @@ class FastAPIHistoryContents:
     @router.post(
         "/api/histories/{history_id}/contents/dataset_collections/{id}/prepare_download",
         summary="Prepare an short term storage object that the collection will be downloaded to.",
+        include_in_schema=False,
+    )
+    @router.post(
+        "/api/dataset_collections/{id}/prepare_download",
+        summary="Prepare an short term storage object that the collection will be downloaded to.",
         responses={
             200: {
                 "description": "Short term storage reference for async monitoring of this download.",
             },
             501: {"description": "Required asynchronous tasks required for this operation not available."},
         },
-    )
-    @router.post(
-        "/api/dataset_collections/{id}/prepare_download",
-        summary="Prepare an short term storage object that the collection will be downloaded to.",
         tags=["dataset collections"],
     )
     def prepare_collection_download(
         self,
         trans: ProvidesHistoryContext = DependsOnTrans,
-        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
         id: DecodedDatabaseIdField = HistoryHDCAIDPathParam,
     ) -> AsyncFile:
         """The history dataset collection will be written as a `zip` archive to the
@@ -750,7 +716,7 @@ class FastAPIHistoryContents:
         summary="Build and return a compressed archive of the selected history contents.",
     )
     @router.get(
-        "/api/histories/{history_id}/contents/archive/{id}",
+        "/api/histories/{history_id}/contents/archive",
         summary="Build and return a compressed archive of the selected history contents.",
     )
     def archive(
@@ -796,99 +762,6 @@ class FastAPIHistoryContents:
         """
         return self.service.create_from_store(trans, history_id, create_payload, serialization_params)
 
-    @router.get(
-        "/api/histories/{history_id}/contents/{direction}/{hid}/{limit}",
-        summary="Get content items around a particular `HID`.",
-    )
-    def contents_near(
-        self,
-        request: Request,
-        response: Response,
-        trans: ProvidesHistoryContext = DependsOnTrans,
-        history_id: DecodedDatabaseIdField = HistoryIDPathParam,
-        hid: int = Path(
-            ...,
-            title="Target HID",
-            description="The target `HID` to get content around it.",
-        ),
-        direction: DirectionOptions = Path(
-            ...,
-            description="Determines what items are selected before, after or near the target `hid`.",
-        ),
-        limit: int = Path(
-            ...,
-            description="The maximum number of content items to return above and below the target `HID`.",
-        ),
-        since: Optional[datetime] = Query(
-            default=None,
-            description=(
-                "A timestamp in ISO format to check if the history has changed since this particular date/time. "
-                "If it hasn't changed, no additional processing will be done and 204 status code will be returned."
-            ),
-        ),
-        serialization_params: SerializationParams = Depends(query_serialization_params),
-    ) -> HistoryContentsResult:
-        """
-        .. warning:: For internal use to support the scroller functionality.
-
-        This endpoint provides random access to a large history without having
-        to know exactly how many pages are in the final query. Pick a target HID
-        and filters, and the endpoint will get a maximum of `limit` history items "around" the `hid`.
-
-        Additional counts are provided in the HTTP headers.
-
-        The `direction` determines what items are selected:
-
-        a) item counts:
-
-           - total matches-up:   hid < {hid}
-           - total matches-down: hid > {hid}
-           - total matches:      total matches-up + total matches-down + 1 (+1 for hid == {hid})
-           - displayed matches-up:   hid <= {hid} (hid == {hid} is included)
-           - displayed matches-down: hid > {hid}
-           - displayed matches:      displayed matches-up + displayed matches-down
-
-        b) {limit} history items:
-
-           - if direction == "before": hid <= {hid}
-           - if direction == "after":  hid > {hid}
-           - if direction == "near":   "near" {hid}, so that
-             n. items before <= limit // 2,
-             n. items after <= limit // 2 + 1.
-
-        .. note:: This endpoint uses slightly different filter params syntax. Instead of using `q`/`qv` parameters,
-            it uses the following syntax for query parameters::
-
-                ?[field]-[operator]=[value]
-
-            Example::
-
-                ?update_time-gt=2015-01-29
-        """
-
-        # Needed to parse arbitrary query parameter names for the filters.
-        # Since we are directly accessing the request's query_params we also need to exclude the
-        # known params that are already parsed by FastAPI or they may be treated as filter params too.
-        # This looks a bit hacky...
-        exclude_params = {"since"}
-        exclude_params.update(SerializationParams.__fields__.keys())
-        filter_params = parse_content_filter_params(request.query_params._dict, exclude=exclude_params)
-
-        result = self.service.contents_near(
-            trans,
-            history_id,
-            serialization_params,
-            filter_params,
-            direction,
-            hid,
-            limit,
-            since,
-        )
-        if result is None:
-            return Response(status_code=status.HTTP_204_NO_CONTENT)  # type: ignore[return-value]
-        response.headers.update(result.stats.to_headers())
-        return result.contents
-
     @router.post(
         "/api/histories/{history_id}/contents/datasets/{id}/materialize",
         summary="Materialize a deferred dataset into real, usable dataset.",
diff --git a/lib/galaxy/webapps/galaxy/api/tasks.py b/lib/galaxy/webapps/galaxy/api/tasks.py
index 4552f9f149c..f57b5847682 100644
--- a/lib/galaxy/webapps/galaxy/api/tasks.py
+++ b/lib/galaxy/webapps/galaxy/api/tasks.py
@@ -2,10 +2,13 @@
 API Controller providing experimental access to Celery Task State.
 """
 import logging
+from uuid import UUID
 
-from celery.result import AsyncResult
-
-from . import Router
+from galaxy.managers.tasks import AsyncTasksManager
+from . import (
+    depends,
+    Router,
+)
 
 log = logging.getLogger(__name__)
 
@@ -14,11 +17,12 @@ router = Router(tags=["tasks"])
 
 @router.cbv
 class FastAPITasks:
+    manager: AsyncTasksManager = depends(AsyncTasksManager)  # type: ignore[type-abstract]
+
     @router.get(
         "/api/tasks/{task_id}/state",
         summary="Determine state of task ID",
         response_description="String indicating task state.",
     )
-    def state(self, task_id: str) -> str:
-        res = AsyncResult(str(task_id))
-        return str(res.state)
+    def state(self, task_id: UUID) -> str:
+        return self.manager.get_state(task_id)
diff --git a/lib/galaxy/webapps/galaxy/api/tool_data.py b/lib/galaxy/webapps/galaxy/api/tool_data.py
index 64c60272cc2..e5fcb33154e 100644
--- a/lib/galaxy/webapps/galaxy/api/tool_data.py
+++ b/lib/galaxy/webapps/galaxy/api/tool_data.py
@@ -1,6 +1,18 @@
-from fastapi import Path
+from fastapi import (
+    Body,
+    Path,
+)
+from pydantic import (
+    BaseModel,
+    Field,
+)
 
+from galaxy.celery.tasks import import_data_bundle
 from galaxy.managers.tool_data import ToolDataManager
+from galaxy.schema.schema import (
+    AsyncTaskResultSummary,
+    ImportToolDataBundleSource,
+)
 from galaxy.tool_util.data._schema import (
     ToolDataDetails,
     ToolDataEntryList,
@@ -8,6 +20,7 @@ from galaxy.tool_util.data._schema import (
     ToolDataItem,
 )
 from galaxy.webapps.base.api import GalaxyFileResponse
+from galaxy.webapps.galaxy.services.base import async_task_summary
 from . import (
     depends,
     Router,
@@ -29,6 +42,10 @@ ToolDataTableFieldName = Path(
 )
 
 
+class ImportToolDataBundle(BaseModel):
+    source: ImportToolDataBundleSource = Field(..., discriminator="src")
+
+
 @router.cbv
 class FastAPIToolData:
     tool_data_manager: ToolDataManager = depends(ToolDataManager)
@@ -43,6 +60,17 @@ class FastAPIToolData:
         """Get the list of all available data tables."""
         return self.tool_data_manager.index()
 
+    @router.post(
+        "/api/tool_data",
+        summary="Import a data manager bundle",
+        require_admin=True,
+    )
+    async def create(self, import_bundle_model: ImportToolDataBundle = Body(...)) -> AsyncTaskResultSummary:
+        source = import_bundle_model.source
+        result = import_data_bundle.delay(**source.dict())
+        summary = async_task_summary(result)
+        return summary
+
     @router.get(
         "/api/tool_data/{table_name}",
         summary="Get details of a given data table",
diff --git a/lib/galaxy/webapps/galaxy/api/trs_consumer.py b/lib/galaxy/webapps/galaxy/api/trs_consumer.py
index d226d89f428..00097c518e7 100644
--- a/lib/galaxy/webapps/galaxy/api/trs_consumer.py
+++ b/lib/galaxy/webapps/galaxy/api/trs_consumer.py
@@ -21,12 +21,12 @@ class TrsConsumeAPIController(BaseGalaxyAPIController):
 
     @expose_api
     def get_tool(self, trans, *args, **kwd):
-        return self._trs_proxy.get_tool(*args, **kwd)
+        return self._trs_proxy.get_server(kwd.pop("trs_server")).get_tool(**kwd)
 
     @expose_api
     def get_versions(self, trans, *args, **kwd):
-        return self._trs_proxy.get_versions(*args, **kwd)
+        return self._trs_proxy.get_server(kwd.pop("trs_server")).get_versions(**kwd)
 
     @expose_api
     def get_version(self, trans, *args, **kwd):
-        return self._trs_proxy.get_version(*args, **kwd)
+        return self._trs_proxy.get_server(kwd.pop("trs_server")).get_version(**kwd)
diff --git a/lib/galaxy/webapps/galaxy/api/trs_search.py b/lib/galaxy/webapps/galaxy/api/trs_search.py
index 2c06c9a27dc..33d844e96bf 100644
--- a/lib/galaxy/webapps/galaxy/api/trs_search.py
+++ b/lib/galaxy/webapps/galaxy/api/trs_search.py
@@ -37,5 +37,5 @@ class TrsSearchAPIController(BaseGalaxyAPIController):
         :type  query: str
         """
         search_kwd = parse_search_kwds(query)
-        rval = self._trs_proxy.get_tools(trs_server, **search_kwd)
+        rval = self._trs_proxy.get_server(trs_server).get_tools(**search_kwd)
         return rval
diff --git a/lib/galaxy/webapps/galaxy/api/users.py b/lib/galaxy/webapps/galaxy/api/users.py
index 29a7fb10406..ece8b5b9706 100644
--- a/lib/galaxy/webapps/galaxy/api/users.py
+++ b/lib/galaxy/webapps/galaxy/api/users.py
@@ -506,7 +506,7 @@ class UserAPIController(BaseGalaxyAPIController, UsesTagsMixin, BaseUIController
                         "type": "text",
                         "label": "Public name",
                         "value": username,
-                        "help": 'Your public name is an identifier that will be used to generate addresses for information you share publicly. Public names must be at least three characters in length and contain only lower-case letters, numbers, and the "-" character.',
+                        "help": 'Your public name is an identifier that will be used to generate addresses for information you share publicly. Public names must be at least three characters in length and contain only lower-case letters, numbers, dots, underscores, and dashes (".", "_", "-").',
                     }
                 )
             info_form_models = self.get_all_forms(
@@ -582,7 +582,7 @@ class UserAPIController(BaseGalaxyAPIController, UsesTagsMixin, BaseUIController
                         label="Public name:",
                         type="text",
                         value=username,
-                        help='Your public name provides a means of identifying you publicly within this tool shed. Public names must be at least three characters in length and contain only lower-case letters, numbers, and the "-" character. You cannot change your public name after you have created a repository in this tool shed.',
+                        help='Your public name provides a means of identifying you publicly within this tool shed. Public names must be at least three characters in length and contain only lower-case letters, numbers, dots, underscores, and dashes (".", "_", "-"). You cannot change your public name after you have created a repository in this tool shed.',
                     )
                 )
         user_info["inputs"] = inputs
@@ -782,6 +782,22 @@ class UserAPIController(BaseGalaxyAPIController, UsesTagsMixin, BaseUIController
                 f"This type is not supported. Given object_type: {object_type}"
             )
 
+    @expose_api
+    def set_theme(self, trans, id: str, theme: str, payload=None, **kwd) -> str:
+        """Sets the user's theme choice.
+        PUT /api/users/{id}/theme/{theme}
+
+        :param id: the encoded id of the user
+        :type  id: str
+        :param theme: the theme identifier/name that the user has selected as preference
+        :type  theme: str
+        """
+        payload = payload or {}
+        user = self._get_user(trans, id)
+        user.preferences["theme"] = theme
+        trans.sa_session.flush()
+        return theme
+
     @expose_api
     def get_password(self, trans, id, payload=None, **kwd):
         """
diff --git a/lib/galaxy/webapps/galaxy/api/workflows.py b/lib/galaxy/webapps/galaxy/api/workflows.py
index 38f2486a4ee..d2e4d0e891d 100644
--- a/lib/galaxy/webapps/galaxy/api/workflows.py
+++ b/lib/galaxy/webapps/galaxy/api/workflows.py
@@ -137,17 +137,6 @@ class WorkflowsAPIController(
         self.workflow_contents_manager = app.workflow_contents_manager
         self.tool_recommendations = recommendations.ToolRecommendations()
 
-    @expose_api
-    def get_workflow_menu(self, trans: ProvidesUserContext, **kwd):
-        """
-        Get workflows present in the tools panel
-        GET /api/workflows/menu
-        """
-        user = trans.user
-        ids_in_menu = [x.stored_workflow_id for x in user.stored_workflow_menu_entries]
-        workflows = self.get_workflows_list(trans, **kwd)
-        return {"ids_in_menu": ids_in_menu, "workflows": workflows}
-
     @expose_api
     def set_workflow_menu(self, trans: GalaxyWebTransaction, payload=None, **kwd):
         """
@@ -187,50 +176,6 @@ class WorkflowsAPIController(
         trans.set_message(message)
         return {"message": message, "status": "done"}
 
-    def get_workflows_list(
-        self,
-        trans: ProvidesUserContext,
-        missing_tools=False,
-        show_published=None,
-        show_shared=None,
-        show_hidden=False,
-        show_deleted=False,
-        **kwd,
-    ):
-        """
-        Displays a collection of workflows.
-
-        :param  show_published:      Optional boolean to include published workflows
-                                     If unspecified this behavior depends on whether the request
-                                     is coming from an authenticated session. The default is true
-                                     for annonymous API requests and false otherwise.
-        :type   show_published:      boolean
-        :param  show_hidden:         if True, show hidden workflows
-        :type   show_hidden:         boolean
-        :param  show_deleted:        if True, show deleted workflows
-        :type   show_deleted:        boolean
-        :param  show_shared:         Optional boolean to include shared workflows.
-                                     If unspecified this behavior depends on show_deleted/show_hidden.
-                                     Defaulting to false if show_hidden or show_deleted is true or else
-                                     false.
-        :param  missing_tools:       if True, include a list of missing tools per workflow
-        :type   missing_tools:       boolean
-        """
-        show_published = util.string_as_bool_or_none(show_published)
-        show_hidden = util.string_as_bool(show_hidden)
-        show_deleted = util.string_as_bool(show_deleted)
-        missing_tools = util.string_as_bool(missing_tools)
-        show_shared = util.string_as_bool_or_none(show_shared)
-        payload = WorkflowIndexPayload(
-            show_published=show_published,
-            show_hidden=show_hidden,
-            show_deleted=show_deleted,
-            show_shared=show_shared,
-            missing_tools=missing_tools,
-        )
-        workflows, _ = self.service.index(trans, payload)
-        return workflows
-
     @expose_api_anonymous_and_sessionless
     def show(self, trans: GalaxyWebTransaction, id, **kwd):
         """
@@ -267,26 +212,6 @@ class WorkflowsAPIController(
                     break
         return self.workflow_contents_manager.workflow_to_dict(trans, stored_workflow, style=style, version=version)
 
-    @expose_api
-    def show_versions(self, trans: GalaxyWebTransaction, workflow_id, **kwds):
-        """
-        GET /api/workflows/{encoded_workflow_id}/versions
-
-        :param  instance:                 true if fetch by Workflow ID instead of StoredWorkflow id, false
-                                          by default.
-        :type   instance:                 boolean
-
-        Lists all versions of this workflow.
-        """
-        instance = util.string_as_bool(kwds.get("instance", "false"))
-        stored_workflow = self.workflow_manager.get_stored_accessible_workflow(
-            trans, workflow_id, by_stored_id=not instance
-        )
-        return [
-            {"version": i, "update_time": w.update_time.isoformat(), "steps": len(w.steps)}
-            for i, w in enumerate(reversed(stored_workflow.workflows))
-        ]
-
     @expose_api
     def create(self, trans: GalaxyWebTransaction, payload=None, **kwd):
         """
@@ -340,11 +265,27 @@ class WorkflowsAPIController(
                     payload["workflow"] = workflow_src
                     return self.__api_import_new_workflow(trans, payload, **kwd)
                 elif archive_source == "trs_tool":
-                    trs_server = payload.get("trs_server")
-                    trs_tool_id = payload.get("trs_tool_id")
-                    trs_version_id = payload.get("trs_version_id")
+                    server = None
+                    trs_tool_id = None
+                    trs_version_id = None
                     import_source = None
-                    archive_data = self.app.trs_proxy.get_version_descriptor(trs_server, trs_tool_id, trs_version_id)
+                    if "trs_url" in payload:
+                        parts = self.app.trs_proxy.match_url(payload["trs_url"])
+                        if parts:
+                            server = self.app.trs_proxy.server_from_url(parts["trs_base_url"])
+                            trs_tool_id = parts["tool_id"]
+                            trs_version_id = parts["version_id"]
+                            payload["trs_tool_id"] = trs_tool_id
+                            payload["trs_version_id"] = trs_version_id
+                        else:
+                            raise exceptions.MessageException("Invalid TRS URL.")
+                    else:
+                        trs_server = payload.get("trs_server")
+                        server = self.app.trs_proxy.get_server(trs_server)
+                        trs_tool_id = payload.get("trs_tool_id")
+                        trs_version_id = payload.get("trs_version_id")
+
+                    archive_data = server.get_version_descriptor(trs_tool_id, trs_version_id)
                 else:
                     try:
                         archive_data = stream_url_to_str(
@@ -1205,6 +1146,10 @@ OffsetQueryParam: Optional[int] = Query(
     title="Number of workflows to skip in sorted query (to enable pagination).",
 )
 
+InstanceQueryParam: Optional[bool] = Query(
+    default=False, title="True when fetching by Workflow ID, False when fetching by StoredWorkflow ID."
+)
+
 query_tags = [
     IndexQueryTag("name", "The stored workflow's name.", "n"),
     IndexQueryTag(
@@ -1239,7 +1184,6 @@ SkipStepCountsQueryParam: bool = Query(
 @router.cbv
 class FastAPIWorkflows:
     service: WorkflowsService = depends(WorkflowsService)
-    invocations_service: InvocationsService = depends(InvocationsService)
 
     @router.get(
         "/api/workflows",
@@ -1368,6 +1312,72 @@ class FastAPIWorkflows:
         self.service.shareable_service.set_slug(trans, id, payload)
         return Response(status_code=status.HTTP_204_NO_CONTENT)
 
+    @router.delete(
+        "/api/workflows/{workflow_id}",
+        summary="Add the deleted flag to a workflow.",
+    )
+    def delete_workflow(
+        self,
+        trans: ProvidesUserContext = DependsOnTrans,
+        workflow_id: DecodedDatabaseIdField = StoredWorkflowIDPathParam,
+    ):
+        self.service.delete(trans, workflow_id)
+        return Response(status_code=status.HTTP_204_NO_CONTENT)
+
+    @router.post(
+        "/api/workflows/{workflow_id}/undelete",
+        summary="Remove the deleted flag from a workflow.",
+    )
+    def undelete_workflow(
+        self,
+        trans: ProvidesUserContext = DependsOnTrans,
+        workflow_id: DecodedDatabaseIdField = StoredWorkflowIDPathParam,
+    ):
+        self.service.undelete(trans, workflow_id)
+        return Response(status_code=status.HTTP_204_NO_CONTENT)
+
+    @router.get(
+        "/api/workflows/{workflow_id}/versions",
+        summary="List all versions of a workflow.",
+    )
+    def show_versions(
+        self,
+        trans: ProvidesUserContext = DependsOnTrans,
+        workflow_id: DecodedDatabaseIdField = StoredWorkflowIDPathParam,
+        instance: Optional[bool] = InstanceQueryParam,
+    ):
+        return self.service.get_versions(trans, workflow_id, instance)
+
+    @router.get(
+        "/api/workflows/menu",
+        summary="Get workflows present in the tools panel.",
+    )
+    def get_workflow_menu(
+        self,
+        trans: ProvidesUserContext = DependsOnTrans,
+        show_deleted: Optional[bool] = DeletedQueryParam,
+        show_hidden: Optional[bool] = HiddenQueryParam,
+        missing_tools: Optional[bool] = MissingToolsQueryParam,
+        show_published: Optional[bool] = ShowPublishedQueryParam,
+        show_shared: Optional[bool] = ShowSharedQueryParam,
+    ):
+        payload = WorkflowIndexPayload(
+            show_published=show_published,
+            show_hidden=show_hidden,
+            show_deleted=show_deleted,
+            show_shared=show_shared,
+            missing_tools=missing_tools,
+        )
+        return self.service.get_workflow_menu(
+            trans,
+            payload=payload,
+        )
+
+
+@router.cbv
+class FastAPIInvocations:
+    invocations_service: InvocationsService = depends(InvocationsService)
+
     @router.post(
         "/api/invocations/{invocation_id}/prepare_store_download",
         summary="Prepare a workflow invocation export-style download.",
@@ -1401,30 +1411,6 @@ class FastAPIWorkflows:
         )
         return rval
 
-    @router.delete(
-        "/api/workflows/{workflow_id}",
-        summary="Add the deleted flag to a workflow.",
-    )
-    def delete_workflow(
-        self,
-        trans: ProvidesUserContext = DependsOnTrans,
-        workflow_id: DecodedDatabaseIdField = StoredWorkflowIDPathParam,
-    ):
-        self.service.delete(trans, workflow_id)
-        return Response(status_code=status.HTTP_204_NO_CONTENT)
-
-    @router.post(
-        "/api/workflows/{workflow_id}/undelete",
-        summary="Remove the deleted flag from a workflow.",
-    )
-    def undelete_workflow(
-        self,
-        trans: ProvidesUserContext = DependsOnTrans,
-        workflow_id: DecodedDatabaseIdField = StoredWorkflowIDPathParam,
-    ):
-        self.service.undelete(trans, workflow_id)
-        return Response(status_code=status.HTTP_204_NO_CONTENT)
-
     # TODO: remove this endpoint after 23.1 release
     @router.get(
         "/api/invocations/{invocation_id}/biocompute",
diff --git a/lib/galaxy/webapps/galaxy/buildapp.py b/lib/galaxy/webapps/galaxy/buildapp.py
index 8c8ba0fe7cc..db6b8b0c67f 100644
--- a/lib/galaxy/webapps/galaxy/buildapp.py
+++ b/lib/galaxy/webapps/galaxy/buildapp.py
@@ -585,9 +585,6 @@ def populate_api_routes(webapp, app):
     webapp.mapper.resource("visualization", "visualizations", path_prefix="/api")
     webapp.mapper.resource("plugins", "plugins", path_prefix="/api")
     webapp.mapper.connect("/api/workflows/build_module", action="build_module", controller="workflows")
-    webapp.mapper.connect(
-        "/api/workflows/menu", action="get_workflow_menu", controller="workflows", conditions=dict(method=["GET"])
-    )
     webapp.mapper.connect(
         "/api/workflows/menu", action="set_workflow_menu", controller="workflows", conditions=dict(method=["PUT"])
     )
@@ -633,13 +630,6 @@ def populate_api_routes(webapp, app):
         action="workflow_dict",
         conditions=dict(method=["GET"]),
     )
-    webapp.mapper.connect(
-        "show_versions",
-        "/api/workflows/{workflow_id}/versions",
-        controller="workflows",
-        action="show_versions",
-        conditions=dict(method=["GET"]),
-    )
     # Preserve the following download route for now for dependent applications  -- deprecate at some point
     webapp.mapper.connect(
         "workflow_dict",
@@ -774,18 +764,6 @@ def populate_api_routes(webapp, app):
         "update_step", "/steps/{step_id}", action="update_invocation_step", conditions=dict(method=["PUT"])
     )
 
-    # ============================
-    # ===== AUTHENTICATE API =====
-    # ============================
-
-    webapp.mapper.connect(
-        "api_key_retrieval",
-        "/api/authenticate/baseauth/",
-        controller="authenticate",
-        action="get_api_key",
-        conditions=dict(method=["GET"]),
-    )
-
     # ======================================
     # ====== DISPLAY APPLICATIONS API ======
     # ======================================
@@ -914,6 +892,14 @@ def populate_api_routes(webapp, app):
         conditions=dict(method=["DELETE"]),
     )
 
+    webapp.mapper.connect(
+        "set_theme",
+        "/api/users/{id}/theme/{theme}",
+        controller="users",
+        action="set_theme",
+        conditions=dict(method=["PUT"]),
+    )
+
     # ========================
     # ===== WEBHOOKS API =====
     # ========================
diff --git a/lib/galaxy/webapps/galaxy/controllers/admin.py b/lib/galaxy/webapps/galaxy/controllers/admin.py
index d5cc80fc293..f5756543cf5 100644
--- a/lib/galaxy/webapps/galaxy/controllers/admin.py
+++ b/lib/galaxy/webapps/galaxy/controllers/admin.py
@@ -1,9 +1,11 @@
 import logging
+from typing import Set
 
 from sqlalchemy import (
     false,
     func,
 )
+from typing_extensions import TypedDict
 
 from galaxy import (
     model,
@@ -17,6 +19,7 @@ from galaxy.exceptions import (
 from galaxy.managers.quotas import QuotaManager
 from galaxy.model import tool_shed_install as install_model
 from galaxy.security.validate_user_input import validate_password
+from galaxy.structured_app import StructuredApp
 from galaxy.util import (
     nice_size,
     pretty_print_time_interval,
@@ -535,6 +538,14 @@ class ToolVersionListGrid(grids.Grid):
         return trans.install_model.context.query(self.model_class)
 
 
+# TODO: Convert admin UI to use the API and drop this.
+class DatatypesEntryT(TypedDict):
+    status: str
+    keys: list
+    data: list
+    message: str
+
+
 class AdminGalaxy(controller.JSAppLauncher):
 
     user_list_grid = UserListGrid()
@@ -564,7 +575,7 @@ class AdminGalaxy(controller.JSAppLauncher):
         "Resend Activation Email", condition=(lambda item: not item.active), allow_multiple=False
     )
 
-    def __init__(self, app):
+    def __init__(self, app: StructuredApp):
         super().__init__(app)
         self.quota_manager: QuotaManager = QuotaManager(app)
 
@@ -594,9 +605,9 @@ class AdminGalaxy(controller.JSAppLauncher):
     @web.expose
     @web.json
     @web.require_admin
-    def data_types_list(self, trans, **kwd):
+    def data_types_list(self, trans, **kwd) -> DatatypesEntryT:
         datatypes = []
-        keys = set()
+        keys: Set[str] = set()
         message = kwd.get("message", "")
         status = kwd.get("status", "done")
         for dtype in sorted(trans.app.datatypes_registry.datatype_elems, key=lambda dt: dt.get("extension")):
diff --git a/lib/galaxy/webapps/galaxy/controllers/forms.py b/lib/galaxy/webapps/galaxy/controllers/forms.py
index 0d7877bea72..8134ffe4b0a 100644
--- a/lib/galaxy/webapps/galaxy/controllers/forms.py
+++ b/lib/galaxy/webapps/galaxy/controllers/forms.py
@@ -1,4 +1,5 @@
 import copy
+import csv
 import logging
 import re
 
@@ -122,7 +123,7 @@ class Forms(BaseUIController):
                     {
                         "name": "type",
                         "type": "select",
-                        "options": [("None", "none")] + [(ft[1], ft[1]) for ft in fd_types],
+                        "options": [(ft[1], ft[1]) for ft in fd_types],
                         "label": "Type",
                     },
                     {
@@ -130,6 +131,7 @@ class Forms(BaseUIController):
                         "label": "Import from CSV",
                         "type": "upload",
                         "help": "Import fields from CSV-file with the following format: Label, Help, Type, Value, Options, Required=True/False.",
+                        "optional": True,
                     },
                 ],
             }
@@ -139,16 +141,18 @@ class Forms(BaseUIController):
             index = 0
             if csv_file:
                 lines = csv_file.splitlines()
-                for line in lines:
-                    row = line.split(",")
+                rows = csv.reader(lines)
+                for row in rows:
                     if len(row) >= 6:
+                        for column in range(len(row)):
+                            row[column] = str(row[column]).strip('"')
                         prefix = "fields_%i|" % index
                         payload[f"{prefix}name"] = "%i_imported_field" % (index + 1)
                         payload[f"{prefix}label"] = row[0]
                         payload[f"{prefix}helptext"] = row[1]
                         payload[f"{prefix}type"] = row[2]
                         payload[f"{prefix}default"] = row[3]
-                        payload[f"{prefix}selectlist"] = row[4].split(",")
+                        payload[f"{prefix}selectlist"] = row[4]
                         payload[f"{prefix}required"] = row[5].lower() == "true"
                     index = index + 1
             new_form, message = self.save_form_definition(trans, None, payload)
@@ -168,9 +172,7 @@ class Forms(BaseUIController):
         latest_form = form.latest_form
         if trans.request.method == "GET":
             fd_types = sorted(trans.app.model.FormDefinition.types.__members__.items())
-            ff_types = [
-                (t.__name__.replace("Field", ""), t.__name__) for t in trans.model.FormDefinition.supported_field_types
-            ]
+            ff_types = [(t.__name__, t.__name__) for t in trans.model.FormDefinition.supported_field_types]
             field_cache = []
             field_inputs = [
                 {
@@ -188,7 +190,7 @@ class Forms(BaseUIController):
                     "label": "Options",
                     "help": "*Only for fields which allow multiple selections, provide comma-separated values.",
                 },
-                {"name": "required", "label": "Required", "type": "boolean", "value": "false"},
+                {"name": "required", "label": "Required", "type": "boolean", "value": False},
             ]
             form_dict = {
                 "title": "Edit form for '%s'" % (util.sanitize_text(latest_form.name)),
@@ -198,7 +200,7 @@ class Forms(BaseUIController):
                     {
                         "name": "type",
                         "type": "select",
-                        "options": [("None", "none")] + [(ft[1], ft[1]) for ft in fd_types],
+                        "options": [(ft[1], ft[1]) for ft in fd_types],
                         "label": "Type",
                         "value": latest_form.type,
                     },
@@ -244,7 +246,6 @@ class Forms(BaseUIController):
                 field_attributes = ["name", "label", "helptext", "required", "type", "selectlist", "default"]
                 field_dict = {attr: payload.get(f"{prefix}{attr}") for attr in field_attributes}
                 field_dict["visible"] = True
-                field_dict["required"] = field_dict["required"] == "true"
                 if isinstance(field_dict["selectlist"], str):
                     field_dict["selectlist"] = field_dict["selectlist"].split(",")
                 else:
@@ -281,7 +282,7 @@ class Forms(BaseUIController):
             desc=current_form["desc"],
             fields=current_form["fields"],
             form_definition_current=None,
-            form_type=current_form["type"],
+            type=current_form["type"],
             layout=current_form["layout"],
         )
         # save changes to the existing form
diff --git a/lib/galaxy/webapps/galaxy/controllers/history.py b/lib/galaxy/webapps/galaxy/controllers/history.py
index 718026877c3..73d9717e7e0 100644
--- a/lib/galaxy/webapps/galaxy/controllers/history.py
+++ b/lib/galaxy/webapps/galaxy/controllers/history.py
@@ -216,7 +216,6 @@ class SharedHistoryListGrid(grids.Grid):
 
 class HistoryController(BaseUIController, SharableMixin, UsesAnnotations, UsesItemRatings):
     history_manager: histories.HistoryManager = depends(histories.HistoryManager)
-    history_export_view: histories.HistoryExportView = depends(histories.HistoryExportView)
     history_serializer: histories.HistorySerializer = depends(histories.HistorySerializer)
     slug_builder: SlugBuilder = depends(SlugBuilder)
 
diff --git a/lib/galaxy/webapps/galaxy/controllers/root.py b/lib/galaxy/webapps/galaxy/controllers/root.py
index 88d8116e9ea..8cc9c61bdc3 100644
--- a/lib/galaxy/webapps/galaxy/controllers/root.py
+++ b/lib/galaxy/webapps/galaxy/controllers/root.py
@@ -90,7 +90,10 @@ class RootController(controller.JSAppLauncher, UsesAnnotations):
 
     @web.expose
     def display_as(self, trans: GalaxyWebTransaction, id=None, display_app=None, **kwd):
-        """Returns a file in a format that can successfully be displayed in display_app."""
+        """
+        Returns a file in a format that can successfully be displayed in display_app;
+        if the file could not be returned, returns a message as a string.
+        """
         # TODO: unencoded id
         data = trans.sa_session.query(self.app.model.HistoryDatasetAssociation).get(id)
         authz_method = "rbac"
diff --git a/lib/galaxy/webapps/galaxy/controllers/workflow.py b/lib/galaxy/webapps/galaxy/controllers/workflow.py
index 63a8d666985..3e51a7d8308 100644
--- a/lib/galaxy/webapps/galaxy/controllers/workflow.py
+++ b/lib/galaxy/webapps/galaxy/controllers/workflow.py
@@ -538,16 +538,13 @@ class WorkflowController(BaseUIController, SharableMixin, UsesStoredWorkflowMixi
         ]
 
         # identify item tags
-        item_tags = [tag for tag in stored.tags if tag.user == trans.user]
-        item_tag_names = []
-        for ta in item_tags:
-            item_tag_names.append(escape(ta.tag.name))
+        item_tags = stored.make_tag_string_list()
 
         # build workflow editor model
         editor_config = {
             "id": trans.security.encode_id(stored.id),
             "name": stored.name,
-            "tags": item_tag_names,
+            "tags": item_tags,
             "initialVersion": version,
             "annotation": self.get_item_annotation_str(trans.sa_session, trans.user, stored),
             "moduleSections": module_sections,
diff --git a/lib/galaxy/webapps/galaxy/fast_app.py b/lib/galaxy/webapps/galaxy/fast_app.py
index 6ad0a5517c6..abe012ba5d6 100644
--- a/lib/galaxy/webapps/galaxy/fast_app.py
+++ b/lib/galaxy/webapps/galaxy/fast_app.py
@@ -152,6 +152,7 @@ def get_fastapi_instance() -> FastAPI:
         title="Galaxy API",
         docs_url="/api/docs",
         openapi_tags=api_tags_metadata,
+        license_info={"name": "MIT", "url": "https://github.com/galaxyproject/galaxy/blob/dev/LICENSE.txt"},
     )
 
 
@@ -164,9 +165,10 @@ def get_openapi_schema() -> Dict[str, Any]:
     return get_openapi(
         title=app.title,
         version=app.version,
-        openapi_version=app.openapi_version,
+        openapi_version="3.1.0",
         description=app.description,
         routes=app.routes,
+        license_info=app.license_info,
     )
 
 
diff --git a/lib/galaxy/webapps/galaxy/services/authenticate.py b/lib/galaxy/webapps/galaxy/services/authenticate.py
index aed0135525e..f71caf88cdb 100644
--- a/lib/galaxy/webapps/galaxy/services/authenticate.py
+++ b/lib/galaxy/webapps/galaxy/services/authenticate.py
@@ -4,10 +4,12 @@ from typing import (
     Dict,
     Optional,
     Tuple,
+    Union,
 )
 from urllib.parse import unquote
 
 from pydantic import BaseModel
+from starlette.requests import Request as StartletteRequest
 
 from galaxy import exceptions
 from galaxy.auth import AuthManager
@@ -17,7 +19,9 @@ from galaxy.util import (
     smart_str,
     unicodify,
 )
-from galaxy.web.framework.base import Request
+from galaxy.web.framework.base import Request as GxRequest
+
+Request = Union[GxRequest, StartletteRequest]
 
 
 class APIKeyResponse(BaseModel):
diff --git a/lib/galaxy/webapps/galaxy/services/base.py b/lib/galaxy/webapps/galaxy/services/base.py
index 50229a82fe1..2b302c89a91 100644
--- a/lib/galaxy/webapps/galaxy/services/base.py
+++ b/lib/galaxy/webapps/galaxy/services/base.py
@@ -59,13 +59,13 @@ class ServiceBase:
     def __init__(self, security: IdEncodingHelper):
         self.security = security
 
-    def decode_id(self, id: EncodedDatabaseIdField) -> int:
+    def decode_id(self, id: EncodedDatabaseIdField, kind: Optional[str] = None) -> int:
         """Decodes a previously encoded database ID."""
-        return decode_with_security(self.security, id)
+        return decode_with_security(self.security, id, kind=kind)
 
-    def encode_id(self, id: int) -> EncodedDatabaseIdField:
+    def encode_id(self, id: int, kind: Optional[str] = None) -> EncodedDatabaseIdField:
         """Encodes a raw database ID."""
-        return encode_with_security(self.security, id)
+        return encode_with_security(self.security, id, kind=kind)
 
     def decode_ids(self, ids: List[EncodedDatabaseIdField]) -> List[int]:
         """
diff --git a/lib/galaxy/webapps/galaxy/services/dataset_collections.py b/lib/galaxy/webapps/galaxy/services/dataset_collections.py
index 03b58b17897..17e17fea5a9 100644
--- a/lib/galaxy/webapps/galaxy/services/dataset_collections.py
+++ b/lib/galaxy/webapps/galaxy/services/dataset_collections.py
@@ -12,10 +12,7 @@ from pydantic import (
     Field,
     ValidationError,
 )
-from typing_extensions import (
-    Annotated,
-    Literal,
-)
+from typing_extensions import Literal
 
 from galaxy import exceptions
 from galaxy.datatypes.registry import Registry
@@ -68,7 +65,7 @@ class DatasetCollectionAttributesResult(Model):
     dbkey: str = Field(..., description="TODO")
     # Are the following fields really used/needed?
     extension: str = Field(..., description="The dataset file extension.", example="txt")
-    model_class: Annotated[Literal["HistoryDatasetCollectionAssociation"], ModelClassField()]
+    model_class: Literal["HistoryDatasetCollectionAssociation"] = ModelClassField("HistoryDatasetCollectionAssociation")
     dbkeys: Optional[Set[str]]
     extensions: Optional[Set[str]]
     tags: TagCollection
diff --git a/lib/galaxy/webapps/galaxy/services/datasets.py b/lib/galaxy/webapps/galaxy/services/datasets.py
index e62dcfd281d..b83f9c5ace2 100644
--- a/lib/galaxy/webapps/galaxy/services/datasets.py
+++ b/lib/galaxy/webapps/galaxy/services/datasets.py
@@ -9,10 +9,12 @@ from typing import (
     Dict,
     List,
     Optional,
+    Tuple,
     Union,
 )
 
 from pydantic import Field
+from starlette.datastructures import URL
 
 from galaxy import (
     exceptions as galaxy_exceptions,
@@ -40,7 +42,17 @@ from galaxy.schema import (
     FilterQueryParams,
     SerializationParams,
 )
-from galaxy.schema.fields import DecodedDatabaseIdField
+from galaxy.schema.drs import (
+    AccessMethod,
+    AccessMethodType,
+    AccessURL,
+    Checksum,
+    DrsObject,
+)
+from galaxy.schema.fields import (
+    DecodedDatabaseIdField,
+    EncodedDatabaseIdField,
+)
 from galaxy.schema.schema import (
     AnyHDA,
     AnyHistoryContentItem,
@@ -408,6 +420,66 @@ class DatasetsService(ServiceBase, UsesVisualizationMixin):
         result = compute_dataset_hash.delay(request=request)
         return async_task_summary(result)
 
+    def drs_dataset_instance(self, object_id: str) -> Tuple[int, DatasetSourceType]:
+        if object_id.startswith("hda-"):
+            decoded_object_id = self.decode_id(EncodedDatabaseIdField(object_id[len("hda-") :]), kind="drs")
+            hda_ldda = DatasetSourceType.hda
+        elif object_id.startswith("ldda-"):
+            decoded_object_id = self.decode_id(EncodedDatabaseIdField(object_id[len("ldda-") :]), kind="drs")
+            hda_ldda = DatasetSourceType.ldda
+        else:
+            raise galaxy_exceptions.RequestParameterInvalidException(
+                "Invalid object_id format specified for this Galaxy server"
+            )
+        return decoded_object_id, hda_ldda
+
+    def get_drs_object(self, trans: ProvidesHistoryContext, object_id: str, request_url: URL) -> DrsObject:
+        decoded_object_id, hda_ldda = self.drs_dataset_instance(object_id)
+        dataset_instance = self.dataset_manager_by_type[hda_ldda].get_accessible(decoded_object_id, trans.user)
+        if not trans.app.security_agent.dataset_is_public(dataset_instance.dataset):
+            # Only public datasets may be access as DRS datasets currently
+            raise galaxy_exceptions.ObjectNotFound("Cannot find a public dataset with specified object ID.")
+
+        # TODO: issue warning if not being served on HTTPS @ 443 - required by the spec.
+        self_uri = f"drs://drs.{request_url.components.netloc}/{object_id}"
+        checksums: List[Checksum] = []
+        for dataset_hash in dataset_instance.dataset.hashes:
+            if dataset_hash.extra_files_path:
+                continue
+            type = dataset_hash.hash_function
+            checksum = dataset_hash.hash_value
+            checksums.append(Checksum(type=type, checksum=checksum))
+
+        if len(checksums) == 0:
+            hash_funciton = HashFunctionNameEnum.md5
+            request = ComputeDatasetHashTaskRequest(
+                dataset_id=dataset_instance.dataset.id,
+                extra_files_path=None,
+                hash_function=hash_funciton,
+                user=None,
+            )
+            compute_dataset_hash.delay(request=request)
+            raise galaxy_exceptions.AcceptedRetryLater(
+                "required checksum task for DRS object response launched.", retry_after=60
+            )
+
+        base = str(request_url).split("/ga4gh", 1)[0]
+        access_url = base + f"/api/drs_download/{object_id}"
+
+        access_method = AccessMethod(
+            type=AccessMethodType.https,
+            access_url=AccessURL(url=access_url),
+        )
+
+        return DrsObject(
+            id=object_id,
+            self_uri=self_uri,
+            size=dataset_instance.dataset.file_size,
+            created_time=dataset_instance.create_time,
+            checksums=checksums,
+            access_methods=[access_method],
+        )
+
     def update_permissions(
         self,
         trans: ProvidesHistoryContext,
@@ -449,7 +521,8 @@ class DatasetsService(ServiceBase, UsesVisualizationMixin):
     def display(
         self,
         trans: ProvidesHistoryContext,
-        history_content_id: DecodedDatabaseIdField,
+        dataset_id: DecodedDatabaseIdField,
+        hda_ldda: DatasetSourceType = DatasetSourceType.hda,
         preview: bool = False,
         filename: Optional[str] = None,
         to_ext: Optional[str] = None,
@@ -466,17 +539,21 @@ class DatasetsService(ServiceBase, UsesVisualizationMixin):
         headers = {}
         rval: Any = ""
         try:
-            hda = self.hda_manager.get_accessible(history_content_id, trans.user)
+            dataset_instance = self.dataset_manager_by_type[hda_ldda].get_accessible(dataset_id, trans.user)
             if raw:
                 if filename and filename != "index":
                     object_store = trans.app.object_store
-                    dir_name = hda.dataset.extra_files_path_name
-                    file_path = object_store.get_filename(hda.dataset, extra_dir=dir_name, alt_name=filename)
+                    dir_name = dataset_instance.dataset.extra_files_path_name
+                    file_path = object_store.get_filename(
+                        dataset_instance.dataset, extra_dir=dir_name, alt_name=filename
+                    )
                 else:
-                    file_path = hda.file_name
+                    file_path = dataset_instance.file_name
                 rval = open(file_path, "rb")
             else:
-                rval, headers = hda.datatype.display_data(trans, hda, preview, filename, to_ext, **kwd)
+                rval, headers = dataset_instance.datatype.display_data(
+                    trans, dataset_instance, preview, filename, to_ext, **kwd
+                )
         except galaxy_exceptions.MessageException:
             raise
         except Exception as e:
diff --git a/lib/galaxy/webapps/galaxy/services/histories.py b/lib/galaxy/webapps/galaxy/services/histories.py
index 5a61edc13d0..95738c2f20d 100644
--- a/lib/galaxy/webapps/galaxy/services/histories.py
+++ b/lib/galaxy/webapps/galaxy/services/histories.py
@@ -33,7 +33,7 @@ from galaxy.managers.citations import CitationsManager
 from galaxy.managers.context import ProvidesHistoryContext
 from galaxy.managers.histories import (
     HistoryDeserializer,
-    HistoryExportView,
+    HistoryExportManager,
     HistoryFilters,
     HistoryManager,
     HistorySerializer,
@@ -100,7 +100,7 @@ class HistoriesService(ServiceBase, ConsumesModelStores, ServesExportStores):
         serializer: HistorySerializer,
         deserializer: HistoryDeserializer,
         citations_manager: CitationsManager,
-        history_export_view: HistoryExportView,
+        history_export_manager: HistoryExportManager,
         filters: HistoryFilters,
         short_term_storage_allocator: ShortTermStorageAllocator,
     ):
@@ -110,7 +110,7 @@ class HistoriesService(ServiceBase, ConsumesModelStores, ServesExportStores):
         self.serializer = serializer
         self.deserializer = deserializer
         self.citations_manager = citations_manager
-        self.history_export_view = history_export_view
+        self.history_export_manager = history_export_manager
         self.filters = filters
         self.shareable_service = ShareableService(self.manager, self.serializer)
         self.short_term_storage_allocator = short_term_storage_allocator
@@ -312,13 +312,10 @@ class HistoriesService(ServiceBase, ConsumesModelStores, ServesExportStores):
         Returns detailed information about the history with the given encoded `id`. If no `id` is
         provided, then the most recently used history will be returned.
 
-        :type   id:      an optional encoded id string
-        :param  id:      the encoded id of the history to query or None to use the most recently used
+        :param  history_id:      the encoded id of the history to query or None to use the most recently used
 
-        :type   serialization_params:   dictionary
         :param  serialization_params:   contains the optional `view`, `keys` and `default_view` for serialization
 
-        :rtype:     dictionary
         :returns:   detailed history information
         """
         if history_id is None:  # By default display the most recent history
@@ -338,49 +335,60 @@ class HistoriesService(ServiceBase, ConsumesModelStores, ServesExportStores):
             history.name,
             payload.model_store_format,
         )
+        export_association = self.history_export_manager.create_export_association(history.id)
         request = GenerateHistoryDownload(
             history_id=history.id,
             short_term_storage_request_id=short_term_storage_target.request_id,
+            duration=short_term_storage_target.duration,
             user=trans.async_request_user,
+            export_association_id=export_association.id,
             **payload.dict(),
         )
         result = prepare_history_download.delay(request=request)
-        return AsyncFile(storage_request_id=short_term_storage_target.request_id, task=async_task_summary(result))
+        task_summary = async_task_summary(result)
+        export_association.task_uuid = task_summary.id
+        trans.sa_session.flush()
+        return AsyncFile(storage_request_id=short_term_storage_target.request_id, task=task_summary)
 
     def write_store(
         self, trans: ProvidesHistoryContext, history_id: DecodedDatabaseIdField, payload: WriteStoreToPayload
     ) -> AsyncTaskResultSummary:
         history = self.manager.get_accessible(history_id, trans.user, current_history=trans.history)
-        request = WriteHistoryTo(user=trans.async_request_user, history_id=history.id, **payload.dict())
+        export_association = self.history_export_manager.create_export_association(history.id)
+        request = WriteHistoryTo(
+            user=trans.async_request_user,
+            history_id=history.id,
+            export_association_id=export_association.id,
+            **payload.dict(),
+        )
         result = write_history_to.delay(request=request)
-        return async_task_summary(result)
+        task_summary = async_task_summary(result)
+        export_association.task_uuid = task_summary.id
+        trans.sa_session.flush()
+        return task_summary
 
     def update(
         self,
         trans: ProvidesHistoryContext,
-        id: DecodedDatabaseIdField,
+        history_id: DecodedDatabaseIdField,
         payload,
         serialization_params: SerializationParams,
     ):
         """Updates the values for the history with the given ``id``
 
-        :type   id:      str
-        :param  id:      the encoded id of the history to update
-        :type   payload: dict
+        :param  history_id:      the encoded id of the history to update
         :param  payload: a dictionary containing any or all the
             fields in :func:`galaxy.model.History.to_dict` and/or the following:
 
             * annotation: an annotation for the history
 
-        :type   serialization_params:   dictionary
         :param  serialization_params:   contains the optional `view`, `keys` and `default_view` for serialization
 
-        :rtype:     dict
         :returns:   an error object if an error occurred or a dictionary containing
             any values that were different from the original and, therefore, updated
         """
         # TODO: PUT /api/histories/{encoded_history_id} payload = { rating: rating } (w/ no security checks)
-        history = self.manager.get_owned(id, trans.user, current_history=trans.history)
+        history = self.manager.get_owned(history_id, trans.user, current_history=trans.history)
         self.deserializer.deserialize(history, payload, user=trans.user, trans=trans)
         return self._serialize_history(trans, history, serialization_params)
 
@@ -397,12 +405,6 @@ class HistoriesService(ServiceBase, ConsumesModelStores, ServesExportStores):
 
         You can purge a history, removing all it's datasets from disk (if unshared),
         by passing in ``purge=True`` in the url.
-
-        :type   serialization_params:   dictionary
-        :param  serialization_params:   contains the optional `view`, `keys` and `default_view` for serialization
-
-        :rtype:     dict
-        :returns:   the deleted or purged history
         """
         history = self.manager.get_owned(history_id, trans.user, current_history=trans.history)
         if purge:
@@ -419,13 +421,10 @@ class HistoriesService(ServiceBase, ConsumesModelStores, ServesExportStores):
     ):
         """Undelete history (that hasn't been purged) with the given ``id``
 
-        :type   id:     str
-        :param  id:     the encoded id of the history to undelete
+        :param  history_id:     the encoded id of the history to undelete
 
-        :type   serialization_params:   dictionary
         :param  serialization_params:   contains the optional `view`, `keys` and `default_view` for serialization
 
-        :rtype:     dict
         :returns:   the undeleted history
         """
         history = self.manager.get_owned(history_id, trans.user, current_history=trans.history)
@@ -497,32 +496,35 @@ class HistoriesService(ServiceBase, ConsumesModelStores, ServesExportStores):
             tool_ids.add(tool_id)
         return [citation.to_dict("bibtex") for citation in self.citations_manager.citations_for_tool_ids(tool_ids)]
 
-    def index_exports(self, trans: ProvidesHistoryContext, id: DecodedDatabaseIdField):
-        """
-        Get previous history exports (to links). Effectively returns serialized
-        JEHA objects.
-        """
-        return self.history_export_view.get_exports(trans, id)
+    def index_exports(
+        self,
+        trans: ProvidesHistoryContext,
+        history_id: DecodedDatabaseIdField,
+        use_tasks: bool = False,
+        limit: Optional[int] = None,
+        offset: Optional[int] = None,
+    ):
+        if use_tasks:
+            return self.history_export_manager.get_task_exports(trans, history_id, limit, offset)
+        return self.history_export_manager.get_exports(trans, history_id)
 
     def archive_export(
         self,
         trans,
-        id: DecodedDatabaseIdField,
+        history_id: DecodedDatabaseIdField,
         payload: Optional[ExportHistoryArchivePayload] = None,
     ) -> Tuple[HistoryArchiveExportResult, bool]:
         """
         start job (if needed) to create history export for corresponding
         history.
 
-        :type   id:     str
-        :param  id:     the encoded id of the history to export
+        :param  history_id:     the encoded id of the history to export
 
-        :rtype:     dict
         :returns:   object containing url to fetch export from.
         """
         if payload is None:
             payload = ExportHistoryArchivePayload()
-        history = self.manager.get_accessible(id, trans.user, current_history=trans.history)
+        history = self.manager.get_accessible(history_id, trans.user, current_history=trans.history)
         jeha = history.latest_export
         exporting_to_uri = payload.directory_uri
         # always just issue a new export when exporting to a URI.
@@ -551,12 +553,12 @@ class HistoriesService(ServiceBase, ConsumesModelStores, ServesExportStores):
             return (JobIdResponse.construct(job_id=job.id), ready)
 
         if up_to_date and jeha.ready:
-            serialized_jeha = self.history_export_view.serialize(trans, id, jeha)
+            serialized_jeha = self.history_export_manager.serialize(trans, history_id, jeha)
             return (JobExportHistoryArchiveModel.construct(**serialized_jeha), ready)
         else:
             # Valid request, just resource is not ready yet.
             if jeha:
-                serialized_jeha = self.history_export_view.serialize(trans, id, jeha)
+                serialized_jeha = self.history_export_manager.serialize(trans, history_id, jeha)
                 return (JobExportHistoryArchiveModel.construct(**serialized_jeha), ready)
             else:
                 assert job is not None, "logic error, don't have a jeha or a job"
@@ -565,12 +567,12 @@ class HistoriesService(ServiceBase, ConsumesModelStores, ServesExportStores):
     def get_ready_history_export(
         self,
         trans: ProvidesHistoryContext,
-        id: DecodedDatabaseIdField,
+        history_id: DecodedDatabaseIdField,
         jeha_id: Union[DecodedDatabaseIdField, LatestLiteral],
     ) -> model.JobExportHistoryArchive:
         """Returns the exported history archive information if it's ready
         or raises an exception if not."""
-        return self.history_export_view.get_ready_jeha(trans, id, jeha_id)
+        return self.history_export_manager.get_ready_jeha(trans, history_id, jeha_id)
 
     def get_archive_download_path(
         self,
@@ -594,24 +596,24 @@ class HistoriesService(ServiceBase, ConsumesModelStores, ServesExportStores):
     def legacy_archive_download(
         self,
         trans: ProvidesHistoryContext,
-        id: DecodedDatabaseIdField,
+        history_id: DecodedDatabaseIdField,
         jeha_id: DecodedDatabaseIdField,
     ):
         """
         If ready and available, return raw contents of exported history.
         """
-        jeha = self.history_export_view.get_ready_jeha(trans, id, jeha_id)
+        jeha = self.history_export_manager.get_ready_jeha(trans, history_id, jeha_id)
         return self.manager.legacy_serve_ready_history_export(trans, jeha)
 
     def get_custom_builds_metadata(
         self,
         trans: ProvidesHistoryContext,
-        id: DecodedDatabaseIdField,
+        history_id: DecodedDatabaseIdField,
     ) -> CustomBuildsMetadataResponse:
         """
         Returns metadata for custom builds.
         """
-        history = self.manager.get_accessible(id, trans.user, current_history=trans.history)
+        history = self.manager.get_accessible(history_id, trans.user, current_history=trans.history)
         installed_builds = []
         for build in glob.glob(os.path.join(trans.app.config.len_file_path, "*.len")):
             installed_builds.append(os.path.basename(build).split(".len")[0])
diff --git a/lib/galaxy/webapps/galaxy/services/history_contents.py b/lib/galaxy/webapps/galaxy/services/history_contents.py
index b90f87490d1..0c72c4b497c 100644
--- a/lib/galaxy/webapps/galaxy/services/history_contents.py
+++ b/lib/galaxy/webapps/galaxy/services/history_contents.py
@@ -1,8 +1,6 @@
-import datetime
 import logging
 import os
 import re
-from enum import Enum
 from typing import (
     Any,
     cast,
@@ -82,8 +80,6 @@ from galaxy.schema.schema import (
     ChangeDatatypeOperationParams,
     ChangeDbkeyOperationParams,
     ColletionSourceType,
-    ContentsNearResult,
-    ContentsNearStats,
     CreateNewCollectionPayload,
     DatasetAssociationRoles,
     DeleteHistoryContentPayload,
@@ -116,7 +112,6 @@ from galaxy.schema.tasks import (
 from galaxy.security.idencoding import IdEncodingHelper
 from galaxy.util.zipstream import ZipstreamWrapper
 from galaxy.web.short_term_storage import ShortTermStorageAllocator
-from galaxy.webapps.galaxy.api.common import parse_serialization_params
 from galaxy.webapps.galaxy.services.base import (
     async_task_summary,
     ConsumesModelStores,
@@ -129,20 +124,9 @@ from galaxy.webapps.galaxy.services.base import (
 log = logging.getLogger(__name__)
 
 DatasetDetailsType = Union[Set[DecodedDatabaseIdField], Literal["all"]]
-
 HistoryItemModel = Union[HistoryDatasetAssociation, HistoryDatasetCollectionAssociation]
 
 
-class DirectionOptions(str, Enum):
-    near = "near"
-    before = "before"
-    after = "after"
-
-
-HistoryContentFilter = List[Any]  # Lists with [attribute:str, operator:str, value:Any]
-HistoryContentsFilterList = List[HistoryContentFilter]
-
-
 class HistoryContentsIndexParams(Model):
     """Query parameters exclusively used by the *new version* of `index` operation."""
 
@@ -853,183 +837,6 @@ class HistoriesContentsService(ServiceBase, ServesExportStores, ConsumesModelSto
             archive.write(file_path, archive_path)
         return archive
 
-    def contents_near(
-        self,
-        trans,
-        history_id: DecodedDatabaseIdField,
-        serialization_params: SerializationParams,
-        filter_params: HistoryContentsFilterList,
-        direction: DirectionOptions,
-        hid: int,
-        limit: int,
-        since: Optional[datetime.datetime] = None,
-    ) -> Optional[ContentsNearResult]:
-        """
-        Return {limit} history items "near" the {hid}. The {direction} determines what items
-        are selected:
-
-        - before: select items with hid < {hid}
-        - after:  select items with hid > {hid}
-        - near:   select items "around" {hid}, so that
-          n. items before <= limit // 2,
-          n. items after <= limit // 2 + 1
-
-        Additional counts provided in the HTTP headers.
-        """
-        history: History = self.history_manager.get_accessible(history_id, trans.user, current_history=trans.history)
-
-        # while polling, check to see if the history has changed
-        # if it hasn't then we can short-circuit the poll request
-        if since:
-            # sqlalchemy DateTime columns are not timezone aware, but `since` may be a timezone aware
-            # DateTime object if a timezone offset is provided (https://github.com/samuelcolvin/pydantic/blob/5ccbdcb5904f35834300b01432a665c75dc02296/pydantic/datetime_parse.py#L179).
-            # If a timezone is provided (since.tzinfo is not None) we convert to UTC and remove tzinfo so that comparison with history.update_time is correct.
-            since = since if since.tzinfo is None else since.astimezone(datetime.timezone.utc).replace(tzinfo=None)
-            if history.update_time <= since:
-                return None
-
-        order_by_dsc = self.build_order_by(self.history_contents_manager, "hid-dsc")
-        order_by_asc = self.build_order_by(self.history_contents_manager, "hid-asc")
-        min_hid, max_hid = self._get_filtered_extrema(history, filter_params, order_by_dsc, order_by_asc)
-        up_total_count, down_total_count = self._get_total_counts(history, filter_params, hid)
-
-        if direction == DirectionOptions.after:  # seek up: contents > hid (newer)
-            _hid_params = self._hid_greater_than(hid)
-            matches = self._get_matches(history, filter_params, _hid_params, order_by_asc, limit, serialization_params)
-            expanded = self._expand_contents(trans, matches, serialization_params)
-            expanded.reverse()
-            item_counts = self._set_item_counts(
-                matches_up=len(matches), total_matches_up=up_total_count, total_matches_down=down_total_count
-            )
-
-        elif direction == DirectionOptions.before:  # seek down: contents <= hid (older)
-            _hid_params = self._hid_less_than(hid)
-            matches = self._get_matches(history, filter_params, _hid_params, order_by_dsc, limit, serialization_params)
-            expanded = self._expand_contents(trans, matches, serialization_params)
-            item_counts = self._set_item_counts(
-                matches_down=len(matches), total_matches_up=up_total_count, total_matches_down=down_total_count
-            )
-
-        elif direction == DirectionOptions.near:  # seek up, down; then reverse up, and combine
-            up_limit, down_limit = self._get_limits(limit)
-
-            _hid_params = self._hid_greater_than(hid)
-            up_matches = self._get_matches(
-                history, filter_params, _hid_params, order_by_asc, up_limit, serialization_params
-            )
-            up_expanded = self._expand_contents(trans, up_matches, serialization_params)
-            up_expanded.reverse()
-
-            _hid_params = self._hid_less_or_equal_than(hid)  # note <=: we are including the item with hid == {hid}
-            down_matches = self._get_matches(
-                history, filter_params, _hid_params, order_by_dsc, down_limit, serialization_params
-            )
-            down_expanded = self._expand_contents(trans, down_matches, serialization_params)
-
-            expanded = up_expanded + down_expanded
-            item_counts = self._set_item_counts(
-                matches_up=len(up_matches),
-                matches_down=len(down_matches),
-                total_matches_up=up_total_count,
-                total_matches_down=down_total_count,
-            )
-
-        stats = ContentsNearStats(
-            max_hid=max_hid,
-            min_hid=min_hid,
-            history_size=history.disk_size,
-            history_empty=history.empty,
-            **item_counts,
-        )
-        return ContentsNearResult(contents=expanded, stats=stats)
-
-    def _get_limits(self, limit):
-        q, r = divmod(limit, 2)
-        return q, q + r
-
-    def _set_item_counts(self, *, matches_up=0, total_matches_up=0, matches_down=0, total_matches_down=0):
-        counts = {}
-        counts["matches"] = matches_up + matches_down
-        counts["matches_up"] = matches_up
-        counts["matches_down"] = matches_down
-        counts["total_matches"] = total_matches_up + total_matches_down + 1  # + 1 for hid == {hid}
-        counts["total_matches_up"] = total_matches_up
-        counts["total_matches_down"] = total_matches_down
-        return counts
-
-    def _hid_greater_than(self, hid: int) -> HistoryContentsFilterList:
-        return [["hid", "gt", hid]]
-
-    def _hid_less_than(self, hid: int) -> HistoryContentsFilterList:
-        return [["hid", "lt", hid]]
-
-    def _hid_less_or_equal_than(self, hid: int) -> HistoryContentsFilterList:
-        return [["hid", "le", hid]]
-
-    def _get_total_counts(self, history, filter_params, hid):
-        def get_count(params, hid_params):
-            params = params + hid_params
-            count_filters = self.history_contents_filters.parse_filters(params)
-            return self.history_contents_manager.contents_count(history, count_filters)
-
-        params = self._copy_excluding_update_time(filter_params)
-        total_up = get_count(params, self._hid_greater_than(hid))
-        total_down = get_count(params, self._hid_less_than(hid))
-        return total_up, total_down
-
-    def _get_matches(self, history, filter_params, hid_params, order_by, limit, serialization_params):
-        params = filter_params + hid_params
-        filters = self.history_contents_filters.parse_filters(params)
-        contents = self.history_contents_manager.contents(
-            history,
-            filters=filters,
-            limit=limit,
-            offset=0,
-            order_by=order_by,
-            serialization_params=serialization_params,
-        )
-        return contents
-
-    def _copy_excluding_update_time(self, filter_params):
-        return [f for f in filter_params if f[0] != "update_time"]
-
-    # Adds subquery details to initial contents results, perhaps better realized
-    # as a proc or view.
-    def _expand_contents(self, trans, contents, serialization_params: SerializationParams):
-        rval = []
-        for content in contents:
-            if isinstance(content, HistoryDatasetAssociation):
-                dataset = self.hda_serializer.serialize_to_view(
-                    content, user=trans.user, trans=trans, **serialization_params.dict()
-                )
-                rval.append(dataset)
-            elif isinstance(content, HistoryDatasetCollectionAssociation):
-                collection = self.hdca_serializer.serialize_to_view(
-                    content, user=trans.user, trans=trans, **serialization_params.dict()
-                )
-                rval.append(collection)
-        return rval
-
-    def _get_filtered_extrema(self, history, filter_params, order_by_dsc, order_by_asc):
-        extrema_params = parse_serialization_params(keys="hid", default_view="summary")
-        extrema_filter_params = self._copy_excluding_update_time(filter_params)
-        extrema_filters = self.history_contents_filters.parse_filters(extrema_filter_params)
-
-        max_row_result = self.history_contents_manager.contents(
-            history, limit=1, filters=extrema_filters, order_by=order_by_dsc, serialization_params=extrema_params
-        )
-        max_row = max_row_result.pop() if len(max_row_result) else None
-
-        min_row_result = self.history_contents_manager.contents(
-            history, limit=1, filters=extrema_filters, order_by=order_by_asc, serialization_params=extrema_params
-        )
-        min_row = min_row_result.pop() if len(min_row_result) else None
-
-        max_hid = max_row.hid if max_row else None
-        min_hid = min_row.hid if min_row else None
-
-        return min_hid, max_hid
-
     def __delete_dataset(
         self, trans, id: DecodedDatabaseIdField, purge: bool, stop_job: bool, serialization_params: SerializationParams
     ):
@@ -1132,7 +939,8 @@ class HistoriesContentsService(ServiceBase, ServesExportStores, ConsumesModelSto
         Allows additional filtering of contents and custom serialization.
         """
         history = self._get_history(trans, history_id)
-        filters = self.history_contents_filters.parse_query_filters(filter_query_params)
+
+        filters = self.history_contents_filters.parse_query_filters_with_relations(filter_query_params, history_id)
 
         stats_requested = accept == HistoryContentsWithStatsResult.__accept_type__
         if stats_requested and self.history_contents_filters.contains_non_orm_filter(filters):
diff --git a/lib/galaxy/webapps/galaxy/services/tools.py b/lib/galaxy/webapps/galaxy/services/tools.py
index 04a09268f78..a95e6357ab7 100644
--- a/lib/galaxy/webapps/galaxy/services/tools.py
+++ b/lib/galaxy/webapps/galaxy/services/tools.py
@@ -163,7 +163,8 @@ class ToolsService(ServiceBase):
         )
 
         input_format = str(payload.get("input_format", "legacy"))
-
+        if "data_manager_mode" in payload:
+            incoming["__data_manager_mode"] = payload["data_manager_mode"]
         vars = tool.handle_input(
             trans, incoming, history=target_history, use_cached_job=use_cached_job, input_format=input_format
         )
diff --git a/lib/galaxy/webapps/galaxy/services/workflows.py b/lib/galaxy/webapps/galaxy/services/workflows.py
index c96f654de33..f714b4cef90 100644
--- a/lib/galaxy/webapps/galaxy/services/workflows.py
+++ b/lib/galaxy/webapps/galaxy/services/workflows.py
@@ -109,6 +109,31 @@ class WorkflowsService(ServiceBase):
         self._workflows_manager.check_security(trans, workflow_to_undelete)
         self._workflows_manager.undelete(workflow_to_undelete)
 
+    def get_versions(self, trans, workflow_id, instance):
+        stored_workflow = self._workflows_manager.get_stored_accessible_workflow(
+            trans, workflow_id, by_stored_id=not instance
+        )
+        return [
+            {"version": i, "update_time": w.update_time.isoformat(), "steps": len(w.steps)}
+            for i, w in enumerate(reversed(stored_workflow.workflows))
+        ]
+
+    def get_workflow_menu(self, trans, payload):
+        ids_in_menu = [x.stored_workflow_id for x in trans.user.stored_workflow_menu_entries]
+        workflows = self._get_workflows_list(
+            trans,
+            payload,
+        )
+        return {"ids_in_menu": ids_in_menu, "workflows": workflows}
+
+    def _get_workflows_list(
+        self,
+        trans: ProvidesUserContext,
+        payload,
+    ):
+        workflows, _ = self.index(trans, payload)
+        return workflows
+
     def __get_full_shed_url(self, url):
         for shed_url in self._tool_shed_registry.tool_sheds.values():
             if url in shed_url:
diff --git a/lib/galaxy/webapps/openapi/utils.py b/lib/galaxy/webapps/openapi/utils.py
index b2abb4ee4ad..9f4c43d9ecc 100644
--- a/lib/galaxy/webapps/openapi/utils.py
+++ b/lib/galaxy/webapps/openapi/utils.py
@@ -185,7 +185,7 @@ def generate_operation_summary(*, route: routing.APIRoute, method: str) -> str:
 def get_openapi_operation_metadata(*, route: routing.APIRoute, method: str, operation_ids: Set[str]) -> Dict[str, Any]:
     operation: Dict[str, Any] = {}
     if route.tags:
-        operation["tags"] = route.tags
+        operation["tags"] = list(set(route.tags))
     operation["summary"] = generate_operation_summary(route=route, method=method)
     if route.description:
         operation["description"] = route.description
@@ -222,8 +222,10 @@ def get_openapi_path(
             parameters: List[Dict[str, Any]] = []
             flat_dependant = get_flat_dependant(route.dependant, skip_repeats=True)
             security_definitions, operation_security = get_openapi_security_definitions(flat_dependant=flat_dependant)
-            if operation_security:
-                operation.setdefault("security", []).extend(operation_security)
+            # https://redocly.com/docs/cli/rules/security-defined/#api-design-principles
+            # be explicit that this is an unsecured endpoint, no API token is needed
+            # (unless required by proxy)
+            operation.setdefault("security", []).extend(operation_security)
             if security_definitions:
                 security_schemes.update(security_definitions)
             all_route_params = get_flat_params(route.dependant)
@@ -370,7 +372,7 @@ def get_openapi(
     *,
     title: str,
     version: str,
-    openapi_version: str = "3.0.2",
+    openapi_version: str = "3.0.3",
     description: Optional[str] = None,
     routes: Sequence[BaseRoute],
     tags: Optional[List[Dict[str, Any]]] = None,
diff --git a/lib/galaxy/workflow/reports/generators/markdown.py b/lib/galaxy/workflow/reports/generators/markdown.py
index 44ccbb759ec..bcc65eebc8d 100644
--- a/lib/galaxy/workflow/reports/generators/markdown.py
+++ b/lib/galaxy/workflow/reports/generators/markdown.py
@@ -3,7 +3,7 @@
 import logging
 import string
 
-from ..generators import WorkflowMarkdownGeneratorPlugin
+from . import WorkflowMarkdownGeneratorPlugin
 
 log = logging.getLogger(__name__)
 
diff --git a/lib/galaxy/workflow/schedulers/core.py b/lib/galaxy/workflow/schedulers/core.py
index a66c6db44eb..427e23f4818 100644
--- a/lib/galaxy/workflow/schedulers/core.py
+++ b/lib/galaxy/workflow/schedulers/core.py
@@ -9,7 +9,7 @@ from galaxy.workflow import (
     run,
     run_request,
 )
-from ..schedulers import ActiveWorkflowSchedulingPlugin
+from . import ActiveWorkflowSchedulingPlugin
 
 if TYPE_CHECKING:
     from galaxy.model import WorkflowInvocation
diff --git a/lib/galaxy/workflow/trs_proxy.py b/lib/galaxy/workflow/trs_proxy.py
index 64510c2dfc2..26d777e364a 100644
--- a/lib/galaxy/workflow/trs_proxy.py
+++ b/lib/galaxy/workflow/trs_proxy.py
@@ -1,5 +1,6 @@
 import logging
 import os
+import re
 import urllib.parse
 
 import requests
@@ -25,6 +26,9 @@ DEFAULT_TRS_SERVERS = [
     },
 ]
 GA4GH_GALAXY_DESCRIPTOR = "GALAXY"
+TRS_URL_REGEX = (
+    r"(?P<trs_base_url>https?:\/\/.+)\/ga4gh\/trs\/v2\/tools\/(?P<tool_id>.+)\/versions\/(?P<version_id>[^\/]+).*"
+)
 
 
 def parse_search_kwds(search_query):
@@ -62,30 +66,53 @@ class TrsProxy:
     def get_servers(self):
         return self._server_list
 
-    def get_tools(self, trs_server, **kwd):
+    def get_server(self, trs_server):
+        trs_url = self._server_dict[trs_server]["api_url"]
+        return TrsServer(trs_url)
+
+    def server_from_url(self, trs_url):
+        return TrsServer(trs_url)
+
+    def match_url(self, url):
+        matches = re.match(TRS_URL_REGEX, url)
+        if matches:
+            match_dict = matches.groupdict()
+            match_dict["tool_id"] = urllib.parse.unquote(match_dict["tool_id"])
+            return match_dict
+        else:
+            return None
+
+
+class TrsServer:
+    def __init__(self, trs_url):
+        self._trs_url = trs_url
+
+    def get_tools(self, **kwd):
         query_kwd = {}
         for key in ["toolClass", "descriptorType", "description", "name", "organization"]:
             value = kwd.pop(key, None)
             if value is not None:
                 query_kwd[key] = value
 
-        trs_api_url = self._get_api_endpoint(trs_server, **kwd)
+        trs_api_url = self._get_api_endpoint(**kwd)
         return self._get(trs_api_url, params=query_kwd)
 
-    def get_tool(self, trs_server, tool_id, **kwd):
-        trs_api_url = self._get_tool_api_endpoint(trs_server, tool_id, **kwd)
+    def get_tool(self, tool_id, **kwd):
+        trs_api_url = self._get_tool_api_endpoint(tool_id, **kwd)
         return self._get(trs_api_url)
 
-    def get_versions(self, trs_server, tool_id, **kwd):
-        trs_api_url = f"{self._get_tool_api_endpoint(trs_server, tool_id, **kwd)}/versions"
+    def get_versions(self, tool_id, **kwd):
+        trs_api_url = f"{self._get_tool_api_endpoint(tool_id, **kwd)}/versions"
         return self._get(trs_api_url)
 
-    def get_version(self, trs_server, tool_id, version_id, **kwd):
-        trs_api_url = f"{self._get_tool_api_endpoint(trs_server, tool_id, **kwd)}/versions/{version_id}"
+    def get_version(self, tool_id, version_id, **kwd):
+        trs_api_url = f"{self._get_tool_api_endpoint(tool_id, **kwd)}/versions/{version_id}"
         return self._get(trs_api_url)
 
-    def get_version_descriptor(self, trs_server, tool_id, version_id, **kwd):
-        trs_api_url = f"{self._get_tool_api_endpoint(trs_server, tool_id, **kwd)}/versions/{version_id}/{GA4GH_GALAXY_DESCRIPTOR}/descriptor"
+    def get_version_descriptor(self, tool_id, version_id, **kwd):
+        trs_api_url = (
+            f"{self._get_tool_api_endpoint(tool_id, **kwd)}/versions/{version_id}/{GA4GH_GALAXY_DESCRIPTOR}/descriptor"
+        )
         return self._get(trs_api_url)["content"]
 
     def _quote(self, tool_id, **kwd):
@@ -111,12 +138,12 @@ class TrsProxy:
                 pass
             raise MessageException.from_code(code, message)
 
-    def _get_api_endpoint(self, trs_server, **kwd):
-        trs_url = self._server_dict[trs_server]["api_url"]
+    def _get_api_endpoint(self, **kwd):
+        trs_url = self._trs_url
         trs_api_endpoint = f"{trs_url}/ga4gh/trs/v2/tools"
         return trs_api_endpoint
 
-    def _get_tool_api_endpoint(self, trs_server, tool_id, **kwd):
+    def _get_tool_api_endpoint(self, tool_id, **kwd):
         tool_id = self._quote(tool_id, **kwd)
-        trs_api_url = f"{self._get_api_endpoint(trs_server, **kwd)}/{tool_id}"
+        trs_api_url = f"{self._get_api_endpoint(**kwd)}/{tool_id}"
         return trs_api_url
diff --git a/lib/galaxy_test/api/test_dataset_collections.py b/lib/galaxy_test/api/test_dataset_collections.py
index 9186a88ee1d..0798c809da8 100644
--- a/lib/galaxy_test/api/test_dataset_collections.py
+++ b/lib/galaxy_test/api/test_dataset_collections.py
@@ -46,7 +46,7 @@ class TestDatasetCollectionsApi(ApiTestCase):
             returned_datasets = dataset_collection["elements"]
             assert len(returned_datasets) == 3, dataset_collection
 
-    def test_create_list_of_existing_pairs(self, history_id):
+    def test_create_list_of_existing_pairs(self):
         with self.dataset_populator.test_history(require_new=False) as history_id:
             pair_payload = self.dataset_collection_populator.create_pair_payload(
                 history_id,
@@ -133,7 +133,7 @@ class TestDatasetCollectionsApi(ApiTestCase):
             for element, zip_path in zip(returned_dce, namelist):
                 assert f"{collection_name}/{element['element_identifier']}.{element['object']['file_ext']}" == zip_path
 
-    def test_list_pair_download(self, history_id):
+    def test_list_pair_download(self):
         with self.dataset_populator.test_history(require_new=False) as history_id:
             fetch_response = self.dataset_collection_populator.create_list_of_pairs_in_history(history_id).json()
             dataset_collection = self.dataset_collection_populator.wait_for_fetched_collection(fetch_response)
@@ -166,7 +166,7 @@ class TestDatasetCollectionsApi(ApiTestCase):
             namelist = archive.namelist()
             assert len(namelist) == 3, f"Expected 3 elements in [{namelist}]"
 
-    def test_list_list_list_download(self, history_id):
+    def test_list_list_list_download(self):
         with self.dataset_populator.test_history(require_new=False) as history_id:
             dataset_collection = self.dataset_collection_populator.create_list_of_list_in_history(
                 history_id,
@@ -181,7 +181,7 @@ class TestDatasetCollectionsApi(ApiTestCase):
             namelist = archive.namelist()
             assert len(namelist) == 3, f"Expected 3 elements in [{namelist}]"
 
-    def test_hda_security(self, history_id):
+    def test_hda_security(self):
         with self.dataset_populator.test_history(require_new=False) as history_id:
             element_identifiers = self.dataset_collection_populator.pair_identifiers(history_id)
             self.dataset_populator.make_private(history_id, element_identifiers[0]["id"])
@@ -210,7 +210,7 @@ class TestDatasetCollectionsApi(ApiTestCase):
             create_response = self._post("dataset_collections", payload, json=True)
             self._assert_status_code_is(create_response, 400)
 
-    def test_upload_collection(self, history_id):
+    def test_upload_collection(self):
         with self.dataset_populator.test_history(require_new=False) as history_id:
             elements = [
                 {
@@ -248,7 +248,7 @@ class TestDatasetCollectionsApi(ApiTestCase):
             dataset_tags = dataset0["tags"]
             assert len(dataset_tags) == 3, dataset0
 
-    def test_upload_nested(self, history_id):
+    def test_upload_nested(self):
         with self.dataset_populator.test_history(require_new=False) as history_id:
             elements = [{"name": "samp1", "elements": [{"src": "files", "dbkey": "hg19", "info": "my cool bed"}]}]
             targets = [
diff --git a/lib/galaxy_test/api/test_drs.py b/lib/galaxy_test/api/test_drs.py
new file mode 100644
index 00000000000..81d77dee25b
--- /dev/null
+++ b/lib/galaxy_test/api/test_drs.py
@@ -0,0 +1,111 @@
+import tempfile
+from typing import (
+    Callable,
+    List,
+)
+from unittest import SkipTest
+from urllib.parse import urlparse
+
+import requests
+
+from galaxy.util.drs import (
+    fetch_drs_to_file,
+    RetryOptions,
+)
+from galaxy_test.base.populators import DatasetPopulator
+from ._framework import ApiTestCase
+
+CONTENT = "My Cool DRS Data\n"
+
+# DRS expects identical get/post for two main API entrypoints.
+HTTP_METHODS: List[Callable[[str], requests.Response]] = [requests.get, requests.post]
+
+CHECKSUM_TEST_SLEEP_TIME = 3.0
+
+
+class TestDrsApi(ApiTestCase):
+    dataset_populator: DatasetPopulator
+
+    def setUp(self):
+        super().setUp()
+        self.dataset_populator = DatasetPopulator(self.galaxy_interactor)
+
+    def test_service_info(self):
+        api_url = f"{self.url}ga4gh/drs/v1/service-info"
+        info_response = requests.get(api_url)
+        info_response.raise_for_status()
+
+    def test_404_on_private_datsets(self):
+        history_id = self.dataset_populator.new_history()
+        hda = self.dataset_populator.new_dataset(history_id, content=CONTENT, wait=True)
+        dataset_id = hda["id"]
+        drs_id = hda["drs_id"]
+        self.dataset_populator.make_private(history_id=history_id, dataset_id=dataset_id)
+        for method in HTTP_METHODS:
+            api_url = f"{self.url}ga4gh/drs/v1/objects/{drs_id}"
+            show_response = method(api_url)
+            assert show_response.status_code == 403
+
+    def test_public_data_access(self):
+        history_id = self.dataset_populator.new_history()
+        hda = self.dataset_populator.new_dataset(history_id, content=CONTENT, wait=True)
+        drs_id = hda["drs_id"]
+        for method in HTTP_METHODS:
+            for _ in range(10):
+                api_url = f"{self.url}ga4gh/drs/v1/objects/{drs_id}"
+                show_response = method(api_url)
+                show_response.raise_for_status()
+                if show_response.status_code != 202:
+                    break
+                else:
+                    import time
+
+                    time.sleep(3)
+            response = show_response.json()
+            access_methods = response["access_methods"]
+            assert len(access_methods) > 0
+            access_method = access_methods[0]
+            assert access_method["type"].startswith("http")
+            access_url = access_method["access_url"]
+            url = access_url["url"]
+            headers_list = access_url.get("headers") or []
+            headers_as_dict = {}
+            for header_str in headers_list:
+                key, value = header_str.split(": ", 1)
+                headers_as_dict[key] = value
+
+            download_response = requests.get(url, headers=headers_as_dict)
+            download_response.raise_for_status()
+            assert download_response.text == CONTENT
+
+    def test_public_data_access_util_code(self):
+        history_id = self.dataset_populator.new_history()
+        hda = self.dataset_populator.new_dataset(history_id, content=CONTENT, wait=True)
+        drs_id = hda["drs_id"]
+        components = urlparse(self.url)
+        netloc = components.netloc
+        scheme = components.scheme
+        if components.path != "/":
+            raise SkipTest("Real DRS cannot be served on Galaxy not hosted at root.")
+        drs_uri = f"drs://{netloc}/{drs_id}"
+        force_http = scheme == "http"
+        with tempfile.NamedTemporaryFile(prefix="gxtest_drs") as tf:
+            retry_options = RetryOptions()
+            retry_options.override_retry_after = CHECKSUM_TEST_SLEEP_TIME
+            fetch_drs_to_file(drs_uri, tf.name, force_http=force_http, retry_options=retry_options)
+            with open(tf.name) as f:
+                assert CONTENT == f.read()
+
+    def test_exception_handling_schema(self):
+        history_id = self.dataset_populator.new_history()
+        hda = self.dataset_populator.new_dataset(history_id, content=CONTENT, wait=True)
+        drs_id = hda["drs_id"]
+
+        for method in HTTP_METHODS:
+            api_url = f"{self.url}ga4gh/drs/v1/objects/{drs_id}/access/fakeid"
+            error_response = method(api_url)
+            assert type(error_response.status_code) == int
+            assert error_response.status_code == 404
+            error_as_dict = error_response.json()
+            assert "status_code" in error_as_dict
+            assert "msg" in error_as_dict
diff --git a/lib/galaxy_test/api/test_folder_contents.py b/lib/galaxy_test/api/test_folder_contents.py
index 95c2b15a257..ab83da984cf 100644
--- a/lib/galaxy_test/api/test_folder_contents.py
+++ b/lib/galaxy_test/api/test_folder_contents.py
@@ -202,7 +202,7 @@ class TestFolderContentsApi(ApiTestCase):
             self._assert_index_count_is_correct(response, expected_contents_count=1)
 
     @requires_new_library
-    def test_index_permissions_include_deleted(self, history_id):
+    def test_index_permissions_include_deleted(self, history_id) -> None:
         folder_name = "Test Folder Contents Index permissions include deleted"
         folder_id = self._create_folder_in_library(folder_name)
 
diff --git a/lib/galaxy_test/api/test_history_contents.py b/lib/galaxy_test/api/test_history_contents.py
index 0ece275b3ed..a51528d96fe 100644
--- a/lib/galaxy_test/api/test_history_contents.py
+++ b/lib/galaxy_test/api/test_history_contents.py
@@ -1,6 +1,4 @@
-import time
 import urllib.parse
-from datetime import datetime
 from typing import (
     Any,
     List,
@@ -8,7 +6,6 @@ from typing import (
     Tuple,
 )
 
-from galaxy.webapps.galaxy.services.history_contents import DirectionOptions
 from galaxy_test.api._framework import ApiTestCase
 from galaxy_test.base.populators import (
     DatasetCollectionPopulator,
@@ -684,136 +681,6 @@ class TestHistoryContentsApi(ApiTestCase):
                 assert "job_state_summary" in c
                 assert isinstance(c["job_state_summary"], dict)
 
-    def _get_content(self, history_id, update_time):
-        return self._get(f"/api/histories/{history_id}/contents/near/100/100?update_time-gt={update_time}").json()
-
-    def test_history_contents_near_with_update_time(self):
-        with self.dataset_populator.test_history() as history_id:
-            first_time = datetime.utcnow().isoformat()
-            assert len(self._get_content(history_id, update_time=first_time)) == 0
-            self.dataset_collection_populator.create_list_in_history(history_id=history_id, wait=True)
-            assert len(self._get_content(history_id, update_time=first_time)) == 4  # 3 datasets
-            self.dataset_populator.wait_for_history(history_id)
-            all_datasets_finished = first_time = datetime.utcnow().isoformat()
-            assert len(self._get_content(history_id, update_time=all_datasets_finished)) == 0
-
-    def test_history_contents_near_with_since(self):
-        with self.dataset_populator.test_history() as history_id:
-            original_history = self._get(f"/api/histories/{history_id}").json()
-            original_history_stamp = original_history["update_time"]
-
-            # check empty contents, with no since flag, should return an empty 200 result
-            history_contents = self._get(f"/api/histories/{history_id}/contents/near/100/100")
-            assert history_contents.status_code == 200
-            assert len(history_contents.json()) == 0
-
-            # adding a since parameter, should return a 204 if history has not changed at all
-            history_contents = self._get(
-                f"/api/histories/{history_id}/contents/near/100/100?since={original_history_stamp}"
-            )
-            assert history_contents.status_code == 204
-
-            # add some stuff
-            self.dataset_collection_populator.create_list_in_history(history_id=history_id, wait=True)
-            self.dataset_populator.wait_for_history(history_id)
-
-            # check to make sure the added stuff is there
-            changed_history_contents = self._get(f"/api/histories/{history_id}/contents/near/100/100")
-            assert changed_history_contents.status_code == 200
-            assert len(changed_history_contents.json()) == 4
-
-            # check to make sure the history date has actually changed due to changing the contents
-            changed_history = self._get(f"/api/histories/{history_id}").json()
-            changed_history_stamp = changed_history["update_time"]
-            assert original_history_stamp != changed_history_stamp
-
-            # a repeated contents request with since=original_history_stamp should now return data
-            # because we have added datasets and the update_time should have been changed
-            changed_content = self._get(
-                f"/api/histories/{history_id}/contents/near/100/100?since={original_history_stamp}"
-            )
-            assert changed_content.status_code == 200
-            assert len(changed_content.json()) == 4
-
-    def test_history_contents_near_since_with_standard_iso8601_date(self):
-        with self.dataset_populator.test_history() as history_id:
-            original_history = self._get(f"/api/histories/{history_id}").json()
-            original_history_stamp = original_history["update_time"]
-
-            # this is the standard date format that javascript will emit using .toISOString(), it
-            # should be the expected date format for any modern api
-            # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString
-
-            # checking to make sure that the same exact history.update_time returns a "not changed"
-            # result after date parsing
-            valid_iso8601_date = original_history_stamp + "Z"
-            encoded_valid_date = urllib.parse.quote_plus(valid_iso8601_date)
-            history_contents = self._get(
-                f"/api/histories/{history_id}/contents/near/100/100?since={encoded_valid_date}"
-            )
-            assert history_contents.status_code == 204
-
-            # test parsing for other standard is08601 formats
-            sample_formats = ["2021-08-26T15:53:02+00:00", "2021-08-26T15:53:02Z", "2002-10-10T12:00:00-05:00"]
-            for date_str in sample_formats:
-                encoded_date = urllib.parse.quote_plus(date_str)  # handles pluses, minuses
-                history_contents = self._get(f"/api/histories/{history_id}/contents/near/100/100?since={encoded_date}")
-                self._assert_status_code_is_ok(history_contents)
-
-    @skip_without_tool("cat_data_and_sleep")
-    def test_history_contents_near_with_update_time_implicit_collection(self):
-        with self.dataset_populator.test_history() as history_id:
-            fetch_response = self.dataset_collection_populator.create_list_in_history(history_id=history_id).json()
-            hdca_id = self.dataset_collection_populator.wait_for_fetched_collection(fetch_response)["id"]
-            self.dataset_populator.wait_for_history(history_id)
-            inputs = {
-                "input1": {"batch": True, "values": [{"src": "hdca", "id": hdca_id}]},
-                "sleep_time": 2,
-            }
-            response = self.dataset_populator.run_tool(
-                "cat_data_and_sleep",
-                inputs,
-                history_id,
-            )
-            update_time = datetime.utcnow().isoformat()
-            collection_id = response["implicit_collections"][0]["id"]
-            for _ in range(20):
-                time.sleep(1)
-                update = self._get_content(history_id, update_time=update_time)
-                if any(
-                    c
-                    for c in update
-                    if c["history_content_type"] == "dataset_collection" and c["job_state_summary"]["ok"] == 3
-                ):
-                    return
-            raise Exception(
-                f"History content update time query did not include final update for implicit collection {collection_id}"
-            )
-
-    @skip_without_tool("collection_creates_dynamic_nested")
-    def test_history_contents_near_with_update_time_explicit_collection(self):
-        with self.dataset_populator.test_history() as history_id:
-            inputs = {"foo": "bar", "sleep_time": 2}
-            response = self.dataset_populator.run_tool(
-                "collection_creates_dynamic_nested",
-                inputs,
-                history_id,
-            )
-            update_time = datetime.utcnow().isoformat()
-            collection_id = response["output_collections"][0]["id"]
-            for _ in range(20):
-                time.sleep(1)
-                update = self._get_content(history_id, update_time=update_time)
-                if any(
-                    c
-                    for c in update
-                    if c["history_content_type"] == "dataset_collection" and c["populated_state"] == "ok"
-                ):
-                    return
-            raise Exception(
-                f"History content update time query did not include populated_state update for dynamic nested collection {collection_id}"
-            )
-
     def test_index_filter_by_type(self, history_id):
         self.dataset_populator.new_dataset(history_id)
         self.dataset_collection_populator.create_list_in_history(history_id=history_id, wait=True)
@@ -892,119 +759,6 @@ class TestHistoryContentsApi(ApiTestCase):
         assert sorted(collection["elements_datatypes"]) == sorted(expected_datatypes)
 
 
-class TestHistoryContentsApiNear(ApiTestCase):
-    """
-    Test the /api/histories/{history_id}/contents/{direction}/{hid}/{limit} endpoint.
-    """
-
-    NEAR = DirectionOptions.near
-    BEFORE = DirectionOptions.before
-    AFTER = DirectionOptions.after
-
-    def setUp(self):
-        super().setUp()
-        self.dataset_populator = DatasetPopulator(self.galaxy_interactor)
-        self.dataset_collection_populator = DatasetCollectionPopulator(self.galaxy_interactor)
-
-    def _create_list_in_history(self, history_id, n=2):
-        # Creates list of size n*4 (n collections with 3 items each)
-        for _ in range(n):
-            self.dataset_collection_populator.create_list_in_history(history_id=history_id, wait=True)
-
-    def _get_content(self, history_id, direction, *, hid, limit=1000):
-        return self._get(f"/api/histories/{history_id}/contents/{direction}/{hid}/{limit}").json()
-
-    def test_returned_hid_sequence_in_base_case(self):
-        with self.dataset_populator.test_history() as history_id:
-            self._create_list_in_history(history_id)
-            result = self._get_content(history_id, self.NEAR, hid=1)
-            assert len(result) == 8
-            assert result[0]["hid"] == 8
-            assert result[1]["hid"] == 7
-            assert result[2]["hid"] == 6
-            assert result[3]["hid"] == 5
-            assert result[4]["hid"] == 4
-            assert result[5]["hid"] == 3
-            assert result[6]["hid"] == 2
-            assert result[7]["hid"] == 1
-
-    def test_near_even_limit(self):
-        with self.dataset_populator.test_history() as history_id:
-            self._create_list_in_history(history_id)
-            result = self._get_content(history_id, self.NEAR, hid=5, limit=3)
-            assert len(result) == 3
-            assert result[0]["hid"] == 6  # hid + 1
-            assert result[1]["hid"] == 5  # hid
-            assert result[2]["hid"] == 4  # hid - 1
-
-    def test_near_odd_limit(self):
-        with self.dataset_populator.test_history() as history_id:
-            self._create_list_in_history(history_id)
-            result = self._get_content(history_id, self.NEAR, hid=5, limit=4)
-            assert len(result) == 4
-            assert result[0]["hid"] == 7  # hid + 2
-            assert result[1]["hid"] == 6  # hid + 1
-            assert result[2]["hid"] == 5  # hid
-            assert result[3]["hid"] == 4  # hid - 1
-
-    def test_near_less_than_before_limit(self):  # n before < limit // 2
-        with self.dataset_populator.test_history() as history_id:
-            self._create_list_in_history(history_id)
-            result = self._get_content(history_id, self.NEAR, hid=1, limit=3)
-            assert len(result) == 2
-            assert result[0]["hid"] == 2  # hid + 1
-            assert result[1]["hid"] == 1  # hid (there's nothing before hid=1)
-
-    def test_near_less_than_after_limit(self):  # n after < limit // 2 + 1
-        with self.dataset_populator.test_history() as history_id:
-            self._create_list_in_history(history_id)
-            result = self._get_content(history_id, self.NEAR, hid=8, limit=3)
-            assert len(result) == 2
-            assert result[0]["hid"] == 8  # hid (there's nothing after hid=8)
-            assert result[1]["hid"] == 7  # hid - 1
-
-    def test_near_less_than_before_and_after_limit(self):
-        with self.dataset_populator.test_history() as history_id:
-            self._create_list_in_history(history_id, n=1)
-            result = self._get_content(history_id, self.NEAR, hid=2, limit=10)
-            assert len(result) == 4
-            assert result[0]["hid"] == 4  # hid + 2  (can't go after hid=4)
-            assert result[1]["hid"] == 3  # hid + 1
-            assert result[2]["hid"] == 2  # hid
-            assert result[3]["hid"] == 1  # hid - 1  (can't go before hid=1)
-
-    def test_before(self):
-        with self.dataset_populator.test_history() as history_id:
-            self._create_list_in_history(history_id)
-            result = self._get_content(history_id, self.BEFORE, hid=5, limit=3)
-            assert len(result) == 3
-            assert result[0]["hid"] == 4  # hid - 1
-            assert result[1]["hid"] == 3  # hid - 2
-            assert result[2]["hid"] == 2  # hid - 3
-
-    def test_before_less_than_limit(self):
-        with self.dataset_populator.test_history() as history_id:
-            self._create_list_in_history(history_id)
-            result = self._get_content(history_id, self.BEFORE, hid=2, limit=3)
-            assert len(result) == 1
-            assert result[0]["hid"] == 1  # hid - 1
-
-    def test_after(self):
-        with self.dataset_populator.test_history() as history_id:
-            self._create_list_in_history(history_id)
-            result = self._get_content(history_id, self.AFTER, hid=5, limit=2)
-            assert len(result) == 2
-            assert result[0]["hid"] == 7  # hid + 2 (hid + 3 not included: tests reversed order)
-            assert result[1]["hid"] == 6  # hid + 1
-
-    def test_after_less_than_limit(self):
-        with self.dataset_populator.test_history() as history_id:
-            self._create_list_in_history(history_id)
-            result = self._get_content(history_id, self.AFTER, hid=7, limit=3)
-            assert len(result) == 1
-            assert result[0]["hid"] == 8  # hid + 1
-
-
 class TestHistoryContentsApiBulkOperation(ApiTestCase):
     """
     Test the `/api/histories/{history_id}/contents/bulk` endpoint and the new
diff --git a/lib/galaxy_test/api/test_jobs.py b/lib/galaxy_test/api/test_jobs.py
index 5ac8b0c690f..c2e289bd435 100644
--- a/lib/galaxy_test/api/test_jobs.py
+++ b/lib/galaxy_test/api/test_jobs.py
@@ -975,7 +975,7 @@ steps:
         jobs_response = self._get("jobs", data=dict(state=states))
         self._assert_status_code_is(jobs_response, 200)
         jobs = jobs_response.json()
-        assert not [j for j in jobs if not j["state"] in states]
+        assert not [j for j in jobs if j["state"] not in states]
         return [j for j in jobs if j["tool_id"] == "__DATA_FETCH__"]
 
     def __history_with_new_dataset(self, history_id):
diff --git a/lib/galaxy_test/api/test_tools.py b/lib/galaxy_test/api/test_tools.py
index c467848a5f8..781d07111e0 100644
--- a/lib/galaxy_test/api/test_tools.py
+++ b/lib/galaxy_test/api/test_tools.py
@@ -7,6 +7,7 @@ from io import BytesIO
 from typing import (
     Any,
     Dict,
+    List,
 )
 
 import pytest
@@ -15,6 +16,7 @@ from requests import (
     put,
 )
 
+from galaxy.tool_util.verify.interactor import ValidToolTestDict
 from galaxy.util import galaxy_root_path
 from galaxy.util.unittest_utils import skip_if_github_down
 from galaxy_test.base import rules_test_data
@@ -957,7 +959,7 @@ class TestToolsApi(ApiTestCase, TestsTools):
         assert tool_info["version"] == "0.2"
 
     @skip_without_tool("cat1")
-    def test_run_cat1_single_meta_wrapper(self, history_id):
+    def test_run_cat1_single_meta_wrapper(self):
         with self.dataset_populator.test_history_for(self.test_run_cat1_single_meta_wrapper) as history_id:
             # Wrap input in a no-op meta parameter wrapper like Sam is planning to
             # use for all UI API submissions.
@@ -1449,55 +1451,60 @@ class TestToolsApi(ApiTestCase, TestsTools):
         def register_job_data(job_data):
             job_data_list.append(job_data)
 
-        tool_test_dicts = [
+        def tool_test_case_list(inputs, required_files) -> List[ValidToolTestDict]:
+            return [
+                {
+                    "inputs": inputs,
+                    "outputs": {},
+                    "required_files": required_files,
+                    "output_collections": [],
+                    "test_index": 0,
+                    "tool_version": "0.1.0",
+                    "tool_id": "dbkey_output_action",
+                    "error": False,
+                }
+            ]
+
+        tool_test_dicts = tool_test_case_list(
             {
-                "inputs": {
-                    "input": ["simple_line.txt"],
-                    "index": ["hg18_value"],
-                },
-                "outputs": {},
-                "required_files": [["simple_line.txt", {"value": "simple_line.txt", "dbkey": "hg18"}]],
-            }
-        ]
+                "input": ["simple_line.txt"],
+                "index": ["hg18_value"],
+            },
+            [["simple_line.txt", {"value": "simple_line.txt", "dbkey": "hg18"}]],
+        )
         dynamic_param_error = None
         test_driver = self.driver_or_skip_test_if_remote()
         try:
-            test_driver.run_tool_test("dbkey_output_action", tool_test_dicts=tool_test_dicts)
+            test_driver.run_tool_test("dbkey_output_action", _tool_test_dicts=tool_test_dicts)
         except Exception as e:
             dynamic_param_error = getattr(e, "dynamic_param_error", False)
         assert dynamic_param_error is None
 
-        tool_test_dicts = [
+        tool_test_dicts = tool_test_case_list(
             {
-                "inputs": {
-                    "input": ["simple_line.txt"],
-                    "index": ["hg18_value"],
-                },
-                "outputs": {},
-                "required_files": [["simple_line.txt", {"value": "simple_line.txt", "dbkey": "hgnot18"}]],
-            }
-        ]
+                "input": ["simple_line.txt"],
+                "index": ["hg18_value"],
+            },
+            [["simple_line.txt", {"value": "simple_line.txt", "dbkey": "hgnot18"}]],
+        )
         dynamic_param_error = None
         try:
-            test_driver.run_tool_test("dbkey_output_action", tool_test_dicts=tool_test_dicts)
+            test_driver.run_tool_test("dbkey_output_action", _tool_test_dicts=tool_test_dicts)
         except Exception as e:
             dynamic_param_error = getattr(e, "dynamic_param_error", False)
         assert dynamic_param_error
 
-        tool_test_dicts = [
+        tool_test_dicts = tool_test_case_list(
             {
-                "inputs": {
-                    "input": ["simple_line.txt"],
-                    "index": ["hgnot18"],
-                },
-                "outputs": {},
-                "required_files": [["simple_line.txt", {"value": "simple_line.txt", "dbkey": "hg18"}]],
-            }
-        ]
+                "input": ["simple_line.txt"],
+                "index": ["hgnot18"],
+            },
+            [["simple_line.txt", {"value": "simple_line.txt", "dbkey": "hg18"}]],
+        )
         dynamic_param_error = None
         try:
             test_driver.run_tool_test(
-                "dbkey_output_action", tool_test_dicts=tool_test_dicts, register_job_data=register_job_data
+                "dbkey_output_action", _tool_test_dicts=tool_test_dicts, register_job_data=register_job_data
             )
         except Exception as e:
             dynamic_param_error = getattr(e, "dynamic_param_error", False)
@@ -1511,7 +1518,7 @@ class TestToolsApi(ApiTestCase, TestsTools):
         try:
             test_driver.run_tool_test(
                 "dbkey_output_action",
-                tool_test_dicts=tool_test_dicts,
+                _tool_test_dicts=tool_test_dicts,
                 skip_on_dynamic_param_errors=True,
                 register_job_data=register_job_data,
             )
diff --git a/lib/galaxy_test/api/test_workflows.py b/lib/galaxy_test/api/test_workflows.py
index 92639f25be7..921f4ad3dcc 100644
--- a/lib/galaxy_test/api/test_workflows.py
+++ b/lib/galaxy_test/api/test_workflows.py
@@ -749,32 +749,6 @@ class TestWorkflowsApi(BaseWorkflowsApiTestCase, ChangeDatatypeTests):
             self._assert_user_has_workflow_with_name(name)
         return upload_response
 
-    def test_get_tool_predictions(self):
-        request = {
-            "tool_sequence": "Cut1",
-            "remote_model_url": "https://github.com/galaxyproject/galaxy-test-data/raw/master/tool_recommendation_model.hdf5",
-        }
-        actual_recommendations = ["Filter1", "cat1", "addValue", "comp1", "Grep1"]
-        route = "workflows/get_tool_predictions"
-        response = self._post(route, data=request)
-        recommendation_response = response.json()
-        is_empty = bool(recommendation_response["current_tool"])
-        if is_empty is False:
-            self._assert_status_code_is(response, 400)
-        else:
-            # check Ok response from the API
-            self._assert_status_code_is(response, 200)
-            recommendation_response = response.json()
-            # check the input tool sequence
-            assert recommendation_response["current_tool"] == request["tool_sequence"]
-            # check non-empty predictions list
-            predicted_tools = recommendation_response["predicted_data"]["children"]
-            assert len(predicted_tools) > 0
-            # check for the correct predictions
-            for tool in predicted_tools:
-                assert tool["tool_id"] in actual_recommendations
-                break
-
     def test_update(self):
         original_workflow = self.workflow_populator.load_workflow(name="test_import")
         uuids = {}
@@ -1053,7 +1027,6 @@ steps:
     def test_base64_import(self):
         base64_url = "base64://" + base64.b64encode(workflow_str.encode("utf-8")).decode("utf-8")
         response = self._post("workflows", data={"archive_source": base64_url})
-        print(response.content)
         response.raise_for_status()
         workflow_id = response.json()["id"]
         workflow = self._download_workflow(workflow_id)
@@ -1071,6 +1044,71 @@ steps:
         assert "Test Workflow" in original_workflow["name"]
         assert original_workflow.get("source_metadata").get("trs_tool_id") == trs_payload["trs_tool_id"]
         assert original_workflow.get("source_metadata").get("trs_version_id") == trs_payload["trs_version_id"]
+        assert original_workflow.get("source_metadata").get("trs_server") == "dockstore"
+
+        # refactor workflow and check that the trs id is removed
+        actions = [
+            {"action_type": "update_step_label", "step": {"order_index": 0}, "label": "new_label"},
+        ]
+        self.workflow_populator.refactor_workflow(workflow_id, actions)
+        refactored_workflow = self._download_workflow(workflow_id)
+        assert refactored_workflow.get("source_metadata") is None
+
+        # reupload original_workflow and check that the trs id is removed
+        reuploaded_workflow_id = self.workflow_populator.create_workflow(original_workflow)
+        reuploaded_workflow = self._download_workflow(reuploaded_workflow_id)
+        assert reuploaded_workflow.get("source_metadata") is None
+
+    def test_trs_import_from_dockstore_trs_url(self):
+        trs_payload = {
+            "archive_source": "trs_tool",
+            "trs_url": "https://dockstore.org/api/ga4gh/trs/v2/tools/"
+            "%23workflow%2Fgithub.com%2Fjmchilton%2Fgalaxy-workflow-dockstore-example-1%2Fmycoolworkflow/"
+            "versions/master",
+        }
+        workflow_id = self._post("workflows", data=trs_payload).json()["id"]
+        original_workflow = self._download_workflow(workflow_id)
+        assert "Test Workflow" in original_workflow["name"]
+        assert (
+            original_workflow.get("source_metadata").get("trs_tool_id")
+            == "#workflow/github.com/jmchilton/galaxy-workflow-dockstore-example-1/mycoolworkflow"
+        )
+        assert original_workflow.get("source_metadata").get("trs_version_id") == "master"
+        assert original_workflow.get("source_metadata").get("trs_server") == ""
+        assert original_workflow.get("source_metadata").get("trs_url") == (
+            "https://dockstore.org/api/ga4gh/trs/v2/tools/"
+            "%23workflow%2Fgithub.com%2Fjmchilton%2Fgalaxy-workflow-dockstore-example-1%2Fmycoolworkflow/"
+            "versions/master"
+        )
+
+        # refactor workflow and check that the trs id is removed
+        actions = [
+            {"action_type": "update_step_label", "step": {"order_index": 0}, "label": "new_label"},
+        ]
+        self.workflow_populator.refactor_workflow(workflow_id, actions)
+        refactored_workflow = self._download_workflow(workflow_id)
+        assert refactored_workflow.get("source_metadata") is None
+
+        # reupload original_workflow and check that the trs id is removed
+        reuploaded_workflow_id = self.workflow_populator.create_workflow(original_workflow)
+        reuploaded_workflow = self._download_workflow(reuploaded_workflow_id)
+        assert reuploaded_workflow.get("source_metadata") is None
+
+    def test_trs_import_from_workflowhub_trs_url(self):
+        trs_payload = {
+            "archive_source": "trs_tool",
+            "trs_url": "https://workflowhub.eu/ga4gh/trs/v2/tools/109/versions/5",
+        }
+        workflow_id = self._post("workflows", data=trs_payload).json()["id"]
+        original_workflow = self._download_workflow(workflow_id)
+        assert "COVID-19: variation analysis reporting" in original_workflow["name"]
+        assert original_workflow.get("source_metadata").get("trs_tool_id") == "109"
+        assert original_workflow.get("source_metadata").get("trs_version_id") == "5"
+        assert original_workflow.get("source_metadata").get("trs_server") == ""
+        assert (
+            original_workflow.get("source_metadata").get("trs_url")
+            == "https://workflowhub.eu/ga4gh/trs/v2/tools/109/versions/5"
+        )
 
         # refactor workflow and check that the trs id is removed
         actions = [
@@ -2231,6 +2269,142 @@ steps:
             self.workflow_populator.validate_biocompute_object(bco)
             assert bco["provenance_domain"]["name"] == "Simple Workflow"
 
+    @skip_without_tool("cat1")
+    def test_export_invocation_ro_crate(self):
+        with self.dataset_populator.test_history() as history_id:
+            summary = self._run_workflow(WORKFLOW_SIMPLE, test_data={"input1": "hello world"}, history_id=history_id)
+            invocation_id = summary.invocation_id
+            crate = self.workflow_populator.get_ro_crate(invocation_id, include_files=True)
+            workflow = crate.mainEntity
+            assert workflow
+
+    @skip_without_tool("__MERGE_COLLECTION__")
+    @skip_without_tool("cat_collection")
+    @skip_without_tool("head")
+    def test_export_invocation_ro_crate_adv(self):
+        with self.dataset_populator.test_history() as history_id:
+            summary = self._run_workflow(
+                """
+class: GalaxyWorkflow
+inputs:
+  input collection 1:
+    type: collection
+    collection_type: list
+    optional: false
+  input collection 2:
+    type: collection
+    collection_type: list
+    optional: false
+  num_lines_param:
+    type: int
+    optional: false
+    default: 2
+outputs:
+  _anonymous_output_1:
+    outputSource: num_lines_param
+  output_collection:
+    outputSource: merge collections tool
+  concatenated_collection:
+    outputSource: concat collection/out_file1
+  output:
+    outputSource: select lines/out_file1
+steps:
+  merge collections tool:
+    tool_id: __MERGE_COLLECTION__
+    tool_version: 1.0.0
+    tool_state:
+      advanced:
+        conflict:
+          __current_case__: 0
+          duplicate_options: suffix_conflict
+          suffix_pattern: _#
+      inputs:
+      - __index__: 0
+        input:
+          __class__: ConnectedValue
+      - __index__: 1
+        input:
+          __class__: ConnectedValue
+    in:
+      inputs_1|input:
+        source: input collection 2
+      inputs_0|input:
+        source: input collection 1
+  concat collection:
+    tool_id: cat_collection
+    tool_state:
+      input1:
+        __class__: RuntimeValue
+    in:
+      input1:
+        source: merge collections tool
+  select lines:
+    tool_id: head
+    tool_state:
+      input:
+        __class__: RuntimeValue
+      lineNum:
+        __class__: ConnectedValue
+    in:
+      lineNum:
+        source: num_lines_param
+      input:
+        source: concat collection/out_file1
+""",
+                test_data="""
+num_lines_param:
+  type: int
+  value: 2
+input collection 1:
+  collection_type: list
+  elements:
+    - identifier: el1
+      value: 1.fastq
+      type: File
+    - identifier: el2
+      value: 1.fastq
+      type: File
+input collection 2:
+  collection_type: list
+  elements:
+    - identifier: el1
+      value: 1.fastq
+      type: File
+    - identifier: el2
+      value: 1.fastq
+      type: File
+""",
+                history_id=history_id,
+                wait=True,
+            )
+            invocation_id = summary.invocation_id
+            crate = self.workflow_populator.get_ro_crate(invocation_id, include_files=True)
+            workflow = crate.mainEntity
+            root = crate.root_dataset
+            assert len(root["mentions"]) == 3
+            actions = [_ for _ in crate.contextual_entities if "CreateAction" in _.type]
+            assert len(actions) == 1
+            wf_action = actions[0]
+            wf_objects = wf_action["object"]
+            assert len(workflow["input"]) == 7
+            assert len(workflow["output"]) == 2
+            collections = [_ for _ in crate.contextual_entities if "Collection" in _.type]
+            assert len(collections) == 3
+            collection = collections[0]
+            assert collection["additionalType"] == "list"
+            assert collection.type == "Collection"
+            assert len(collection["hasPart"]) == 2
+            for dataset in collection["hasPart"]:
+                assert dataset in wf_objects
+
+            coll_dataset = collection["hasPart"][0].id
+            assert coll_dataset in [_.id for _ in collections[2]["hasPart"]]
+            property_values = [_ for _ in crate.contextual_entities if "PropertyValue" in _.type]
+            assert len(property_values) == 2
+            for pv in property_values:
+                assert pv in wf_objects
+                assert pv["exampleOfWork"] in workflow["input"]
+
     @skip_without_tool("__APPLY_RULES__")
     def test_workflow_run_apply_rules(self):
         with self.dataset_populator.test_history() as history_id:
diff --git a/lib/galaxy_test/base/populators.py b/lib/galaxy_test/base/populators.py
index f058f4a4967..728bb0cee70 100644
--- a/lib/galaxy_test/base/populators.py
+++ b/lib/galaxy_test/base/populators.py
@@ -67,7 +67,7 @@ from typing import (
 )
 from uuid import UUID
 
-import cwltest.utils
+import cwltest.compare
 import requests
 import yaml
 from bioblend.galaxy import GalaxyClient
@@ -77,6 +77,7 @@ from gxformat2 import (
 )
 from gxformat2._yaml import ordered_load
 from requests import Response
+from rocrate.rocrate import ROCrate
 from typing_extensions import Literal
 
 from galaxy.tool_util.client.staging import InteractorStaging
@@ -901,13 +902,17 @@ class BaseDatasetPopulator(BasePopulator):
         assert "id" in create_response_json
         return create_response_json
 
-    def get_history_dataset_content(self, history_id: str, wait=True, filename=None, type="text", raw=False, **kwds):
+    def get_history_dataset_content(
+        self, history_id: str, wait=True, filename=None, type="text", to_ext=None, raw=False, **kwds
+    ):
         dataset_id = self.__history_content_id(history_id, wait=wait, **kwds)
         data = {}
         if filename:
             data["filename"] = filename
         if raw:
             data["raw"] = True
+        if to_ext is not None:
+            data["to_ext"] = to_ext
         display_response = self._get_contents_request(history_id, f"/{dataset_id}/display", data=data)
         assert display_response.status_code == 200, display_response.text
         if type == "text":
@@ -1378,6 +1383,20 @@ class BaseDatasetPopulator(BasePopulator):
         task_ok = self.wait_on_task_id(task_id)
         assert task_ok, f"Task: Import history from {target_uri} failed"
 
+    def download_history_to_store(self, history_id: str, extension: str = "tgz", serve_file: bool = False):
+        url = f"histories/{history_id}/prepare_store_download"
+        download_response = self._post(url, dict(include_files=False, model_store_format=extension), json=True)
+        storage_request_id = self.assert_download_request_ok(download_response)
+        self.wait_for_download_ready(storage_request_id)
+        if serve_file:
+            return self._get_to_tempfile(f"short_term_storage/{storage_request_id}")
+
+    def get_history_export_tasks(self, history_id: str):
+        headers = {"accept": "application/vnd.galaxy.task.export+json"}
+        response = self._get(f"histories/{history_id}/exports", headers=headers)
+        api_asserts.assert_status_code_is_ok(response)
+        return response.json()
+
 
 class GalaxyInteractorHttpMixin:
     galaxy_interactor: ApiTestInteractor
@@ -1552,9 +1571,9 @@ class BaseWorkflowPopulator(BasePopulator):
         r.raise_for_status()
         return r.json()
 
-    def download_invocation_to_store(self, invocation_id, extension="tgz"):
+    def download_invocation_to_store(self, invocation_id, include_files=False, extension="tgz"):
         url = f"invocations/{invocation_id}/prepare_store_download"
-        download_response = self._post(url, dict(include_files=False, model_store_format=extension), json=True)
+        download_response = self._post(url, dict(include_files=include_files, model_store_format=extension), json=True)
         storage_request_id = self.dataset_populator.assert_download_request_ok(download_response)
         self.dataset_populator.wait_for_download_ready(storage_request_id)
         return self._get_to_tempfile(f"short_term_storage/{storage_request_id}")
@@ -1604,6 +1623,19 @@ class BaseWorkflowPopulator(BasePopulator):
     ):
         JsonSchemaValidator.validate_using_schema_url(bco, expected_schema_version)
 
+    def get_ro_crate(self, invocation_id, include_files=False):
+        crate_response = self.download_invocation_to_store(
+            invocation_id=invocation_id, include_files=include_files, extension="rocrate.zip"
+        )
+        return ROCrate(crate_response)
+
+    def validate_invocation_crate_directory(self, crate_directory):
+        # TODO: where can a ro_crate be extracted
+        metadata_json_path = crate_directory / "ro-crate-metadata.json"
+        with metadata_json_path.open() as f:
+            metadata_json = json.load(f)
+            assert metadata_json["@context"] == "https://w3id.org/ro/crate/1.1/context"
+
     def invoke_workflow_raw(self, workflow_id: str, request: dict, assert_ok: bool = False) -> Response:
         url = f"workflows/{workflow_id}/invocations"
         invocation_response = self._post(url, data=request)
@@ -2227,7 +2259,7 @@ class CwlPopulator:
         try:
             for key, value in expected_outputs.items():
                 actual_output = run.get_output_as_object(key)
-                cwltest.utils.compare(value, actual_output)
+                cwltest.compare.compare(value, actual_output)
         except Exception:
             self.dataset_populator._summarize_history(run.history_id)
             raise
diff --git a/lib/galaxy_test/selenium/test_history_panel.py b/lib/galaxy_test/selenium/test_history_panel.py
index 883022b028d..3e367ca2ac1 100644
--- a/lib/galaxy_test/selenium/test_history_panel.py
+++ b/lib/galaxy_test/selenium/test_history_panel.py
@@ -106,7 +106,7 @@ class TestHistoryPanel(SeleniumTestCase):
         assert_no_tags()
 
         # add new tags to empty tags area
-        tags_size = 5
+        tags_size = 6
         tags = add_tags(tags_size)
         assert_current_tags(tags)
 
diff --git a/lib/galaxy_test/selenium/test_personal_information.py b/lib/galaxy_test/selenium/test_personal_information.py
index 4e5985814fc..74fdcb7e99b 100644
--- a/lib/galaxy_test/selenium/test_personal_information.py
+++ b/lib/galaxy_test/selenium/test_personal_information.py
@@ -135,7 +135,9 @@ class TestManageInformation(SeleniumTestCase):
         element.send_keys(new_input_text)
 
     def get_address_input_field(self, address_form, input_field_label):
-        return address_form.find_element(self.by.CSS_SELECTOR, f"[data-label='{input_field_label}'] > input")
+        return address_form.find_element(
+            self.by.CSS_SELECTOR, f"[data-label='{input_field_label}'] > div > div > input"
+        )
 
 
 class TestDeleteCurrentAccount(SeleniumTestCase):
diff --git a/lib/galaxy_test/selenium/test_workflow_editor.py b/lib/galaxy_test/selenium/test_workflow_editor.py
index f7de0383af0..f58142eef8b 100644
--- a/lib/galaxy_test/selenium/test_workflow_editor.py
+++ b/lib/galaxy_test/selenium/test_workflow_editor.py
@@ -4,6 +4,7 @@ import pytest
 import yaml
 from selenium.webdriver.common.action_chains import ActionChains
 from selenium.webdriver.common.keys import Keys
+from seletools.actions import drag_and_drop
 
 from galaxy_test.base.workflow_fixtures import (
     WORKFLOW_NESTED_SIMPLE,
@@ -101,11 +102,8 @@ class TestWorkflowEditor(SeleniumTestCase, RunsWorkflows):
         node = editor.node._(label="select_from_dataset_optional")
         node.title.wait_for_and_click()
         self.components.tool_form.parameter_checkbox(parameter="select_single").wait_for_and_click()
-        # External (selenium-side) debounce hack for old backbone input
-        # TODO: remove when form elements are all converted.
-        self.components.tool_form.parameter_input(parameter="select_single").wait_for_and_send_keys("parameter valu")
-        self.sleep_for(self.wait_types.UX_RENDER)
-        self.components.tool_form.parameter_input(parameter="select_single").wait_for_and_send_keys("e")
+        self.components.tool_form.parameter_input(parameter="select_single").wait_for_and_send_keys("parameter value")
+        # onSetData does an extra POST to build_modules, so we need to wait for that ...
         self.sleep_for(self.wait_types.UX_RENDER)
         self.assert_workflow_has_changes_and_save()
         workflow = self.workflow_populator.download_workflow(workflow_id)
@@ -254,8 +252,7 @@ steps:
 
         tool_node = editor.node._(label="tool_exec")
         tool_input = tool_node.input_terminal(name="inttest")
-        tool_input.wait_for_and_click()
-
+        self.hover_over(tool_input.wait_for_visible())
         editor.connector_destroy_callout.wait_for_and_click()
         self.assert_not_connected("input_int#output", "tool_exec#inttest")
         self.screenshot("workflow_editor_parameter_connection_destroyed")
@@ -338,7 +335,7 @@ steps:
 
         cat_node = editor.node._(label="first_cat")
         cat_input = cat_node.input_terminal(name="input1")
-        cat_input.wait_for_and_click()
+        self.hover_over(cat_input.wait_for_visible())
         editor.connector_destroy_callout.wait_for_visible()
         self.screenshot("workflow_editor_connection_callout")
         editor.connector_destroy_callout.wait_for_and_click()
@@ -557,7 +554,7 @@ steps:
         node.wait_for_and_click()
         editor.configure_output(output="out_file1").wait_for_and_click()
         editor.change_datatype.wait_for_and_click()
-        editor.select_dataype_text_search.wait_for_and_send_keys("bam")
+        editor.select_datatype_text_search.wait_for_and_send_keys("bam")
         editor.select_datatype(datatype="bam").wait_for_and_click()
         editor.node.output_data_row(output_name="out_file1", extension="bam").wait_for_visible()
         self.assert_not_connected("create_2#out_file1", "checksum#input")
@@ -662,7 +659,7 @@ steps:
         self.set_text_element(output_label, "workflow output label")
         self.set_text_element(editor.rename_output, "renamed_output")
         editor.change_datatype.wait_for_and_click()
-        editor.select_dataype_text_search.wait_for_and_send_keys("bam")
+        editor.select_datatype_text_search.wait_for_and_send_keys("bam")
         editor.select_datatype(datatype="bam").wait_for_and_click()
         self.set_text_element(editor.add_tags, "#crazynewtag")
         self.set_text_element(editor.remove_tags, "#oldboringtag")
@@ -713,6 +710,23 @@ steps:
         assert subworkflow_step["type"] == "subworkflow"
         assert subworkflow_step["subworkflow"]["a_galaxy_workflow"] == "true"
 
+    @selenium_test
+    def test_editor_insert_steps(self):
+        steps_to_insert = self.workflow_upload_yaml_with_random_name(WORKFLOW_SIMPLE_CAT_TWICE)
+        annotation = "insert step test"
+        self.workflow_create_new(annotation=annotation)
+        self.workflow_editor_add_input(item_name="data_input")
+        editor = self.components.workflow_editor
+        editor.canvas_body.wait_for_visible()
+        editor.tool_menu.wait_for_visible()
+        editor.tool_menu_section_link(section_name="workflows").wait_for_and_click()
+        editor.insert_steps(workflow_title=steps_to_insert).wait_for_and_click()
+        self.assert_connected("input1#output", "first_cat#input1")
+        self.assert_workflow_has_changes_and_save()
+        workflow_id = self.driver.current_url.split("id=")[1]
+        workflow = self.workflow_populator.download_workflow(workflow_id)
+        assert len(workflow["steps"]) == 3
+
     @selenium_test
     def test_editor_invalid_tool_state(self):
         workflow_populator = self.workflow_populator
@@ -770,6 +784,60 @@ steps:
         self.components.tool_panel.search.wait_for_and_send_keys(new_workflow_name)
         assert_workflow_bookmarked_status(True)
 
+    def tab_to(self, accessible_name, direction="forward"):
+        for _ in range(100):
+            ac = self.action_chains()
+            if direction == "backwards":
+                ac.key_down(Keys.SHIFT)
+            ac.send_keys(Keys.TAB)
+            if direction == "backwards":
+                ac.key_down(Keys.SHIFT)
+            ac.perform()
+            if accessible_name in self.driver.switch_to.active_element.accessible_name:
+                return self.driver.switch_to.active_element
+        else:
+            raise Exception(f"Could not tab to element containing '{accessible_name}' in aria-label")
+
+    @selenium_test
+    def test_aria_connections_menu(self):
+        self.open_in_workflow_editor(
+            """
+class: GalaxyWorkflow
+inputs:
+  input1: data
+steps:
+  first_cat:
+    position:
+      # Step should be positioned off-screen, tabbing should scroll to node
+      top: 2000
+      left: 2000
+    tool_id: cat
+    in:
+      input1: input1
+      queries_0|input2: input1
+""",
+            auto_layout=False,
+        )
+        self.assert_connected("input1#output", "first_cat#input1")
+        self.screenshot("workflow_editor_connection_simple")
+        self.components.workflow_editor.canvas_body.wait_for_and_click()
+        output_connector = self.tab_to("Press space to see a list of available inputs")
+        output_connector.send_keys(Keys.SPACE)
+        assert self.driver.switch_to.active_element.text == "Disconnect from input1 in step 2: first_cat"
+        self.driver.switch_to.active_element.send_keys(Keys.ENTER)
+        self.assert_not_connected("input1#output", "first_cat#input1")
+        self.action_chains().move_to_element(self.components.workflow_editor.canvas_body.wait_for_and_click()).perform()
+        output_connector = self.tab_to("Press space to see a list of available inputs")
+        output_connector.send_keys(Keys.SPACE)
+        assert self.driver.switch_to.active_element.text == "Connect to input1 in step 2: first_cat"
+        self.driver.switch_to.active_element.send_keys(Keys.ENTER)
+        self.assert_connected("input1#output", "first_cat#input1")
+        self.action_chains().move_to_element(self.components.workflow_editor.canvas_body.wait_for_and_click()).perform()
+        output_connector = self.tab_to("Press space to see a list of available inputs")
+        output_connector = self.tab_to("Press space to see a list of available inputs")
+        output_connector.send_keys(Keys.SPACE)
+        assert self.driver.switch_to.active_element.text == "No compatible input found in workflow"
+
     def workflow_editor_maximize_center_pane(self, collapse_left=True, collapse_right=True):
         if collapse_left:
             self.components._.left_panel_collapse.wait_for_and_click()
@@ -781,17 +849,14 @@ steps:
         source_id, sink_id = self.workflow_editor_source_sink_terminal_ids(source, sink)
         source_element = self.find_element_by_selector(f"#{source_id}")
         sink_element = self.find_element_by_selector(f"#{sink_id}")
-
         ac = self.action_chains()
         ac = ac.move_to_element(source_element).click_and_hold()
         if screenshot_partial:
-            ac = ac.move_to_element_with_offset(sink_element, -5, 0)
+            ac = ac.move_by_offset(10, 10)
             ac.perform()
             self.sleep_for(self.wait_types.UX_RENDER)
             self.screenshot(screenshot_partial)
-            ac = self.action_chains()
-
-        ac = ac.move_to_element(sink_element).release().perform()
+        drag_and_drop(self.driver, source_element, sink_element)
 
     def assert_connected(self, source, sink):
         source_id, sink_id = self.workflow_editor_source_sink_terminal_ids(source, sink)
@@ -807,6 +872,7 @@ steps:
         self.workflow_index_open_with_name(name)
         if auto_layout:
             self.workflow_editor_click_option("Auto Layout")
+            self.sleep_for(self.wait_types.UX_RENDER)
         return name
 
     def workflow_editor_source_sink_terminal_ids(self, source, sink):
@@ -818,14 +884,14 @@ steps:
         source_node = editor.node._(label=source_node_label)
         sink_node = editor.node._(label=sink_node_label)
 
-        source_node.wait_for_visible()
-        sink_node.wait_for_visible()
+        source_node.wait_for_present()
+        sink_node.wait_for_present()
 
         output_terminal = source_node.output_terminal(name=source_output)
         input_terminal = sink_node.input_terminal(name=sink_input)
 
-        output_element = output_terminal.wait_for_visible()
-        input_element = input_terminal.wait_for_visible()
+        output_element = output_terminal.wait_for_present()
+        input_element = input_terminal.wait_for_present()
 
         source_id = output_element.get_attribute("id")
         sink_id = input_element.get_attribute("id")
@@ -847,8 +913,8 @@ steps:
 
         sink_node_label, sink_input_name = sink.split("#", 1)
         sink_node = editor.node._(label=sink_node_label)
-        sink_input = sink_node.input_terminal(name=sink_input_name)
-        sink_input.wait_for_and_click()
+        sink_input = sink_node.input_terminal(name=sink_input_name).wait_for_visible()
+        self.hover_over(sink_input)
         editor.connector_destroy_callout.wait_for_and_click()
 
     def assert_input_mapped(self, sink):
diff --git a/lib/tool_shed/webapp/model/__init__.py b/lib/tool_shed/webapp/model/__init__.py
index 130963cc53f..b45b802686c 100644
--- a/lib/tool_shed/webapp/model/__init__.py
+++ b/lib/tool_shed/webapp/model/__init__.py
@@ -1,5 +1,7 @@
 import logging
 import os
+import random
+import string
 import weakref
 from datetime import (
     datetime,
@@ -172,6 +174,15 @@ class User(Base, Dictifiable):
         # Set 'self.password' to the digest of 'cleartext'.
         self.password = new_insecure_hash(text_type=cleartext)
 
+    def set_random_password(self, length=16):
+        """
+        Sets user password to a random string of the given length.
+        :return: void
+        """
+        self.set_password_cleartext(
+            "".join(random.SystemRandom().choice(string.ascii_letters + string.digits) for _ in range(length))
+        )
+
 
 class PasswordResetToken(Base):
     __tablename__ = "password_reset_token"
diff --git a/lib/tool_shed/webapp/templates/base/base_panels.mako b/lib/tool_shed/webapp/templates/base/base_panels.mako
index 4f1e4f519ce..1e03101b6c8 100644
--- a/lib/tool_shed/webapp/templates/base/base_panels.mako
+++ b/lib/tool_shed/webapp/templates/base/base_panels.mako
@@ -156,7 +156,7 @@
             <div id="background"></div>
 
             ## Layer iframes over backgrounds
-            <div id="masthead" class="navbar navbar-fixed-top navbar-inverse">
+            <div>
                 ${self.masthead()}
             </div>
 
diff --git a/lib/tool_shed/webapp/templates/webapps/tool_shed/base_panels.mako b/lib/tool_shed/webapp/templates/webapps/tool_shed/base_panels.mako
index 4db5311dba0..ea8a4275604 100644
--- a/lib/tool_shed/webapp/templates/webapps/tool_shed/base_panels.mako
+++ b/lib/tool_shed/webapp/templates/webapps/tool_shed/base_panels.mako
@@ -20,7 +20,7 @@
     <script type="text/javascript">
         config.addInitialization(function() {
             console.log("toolshed/base_panels.mako", "hardcoded dropdown init");
-            
+
             // Masthead dropdown menus
             var $dropdowns = $("#masthead ul.nav > li.dropdown > .dropdown-menu");
             $("body").on( "click.nav_popups", function( e ) {
@@ -56,127 +56,128 @@
     %endif
 
     ## start main tag
-    <nav id="masthead" class="navbar navbar-expand fixed-top justify-content-center navbar-dark">
+    <nav id="masthead" class="masthead-toolshed navbar navbar-expand navbar-fixed-top justify-content-center navbar-dark">
 
-      ## Logo, layered over tabs to be clickable
-      <a href="${h.url_for( app.config.get( 'logo_url', '/' ) )}" aria-label="homepage" class="navbar-brand">
-          <img alt="logo" class="navbar-brand-image" src="${h.url_for('/static/favicon.png')}">
-          <span class="navbar-brand-title">
-          Galaxy Tool Shed
-          %if app.config.brand:
-              / ${app.config.brand}
-          %endif
-      </a>
+        ## Logo, layered over tabs to be clickable
+        <a href="${h.url_for( app.config.get( 'logo_url', '/' ) )}" aria-label="homepage" class="navbar-brand">
+            <img alt="logo" class="navbar-brand-image" src="${h.url_for('/static/favicon.svg')}">
+            <span class="navbar-brand-title">
+                Tool Shed
+                %if app.config.brand:
+                    / ${app.config.brand}
+                %endif
+            </span>
+        </a>
 
+        ## Tab area, fills entire width
+        <ul class="navbar-nav">
+            <%def name="tab( id, display, href, target='_parent', visible=True, extra_class='', menu_options=None )">
+                <%
+                cls = "nav-item"
+                a_cls = "nav-link"
+                extra = ""
+                if extra_class:
+                    cls = extra_class
+                if self.active_view == id:
+                    cls += " active"
+                if menu_options:
+                    cls += " dropdown"
+                    a_cls += " dropdown-toggle"
+                    extra = "<b class='caret'></b>"
+                style = ""
+                if not visible:
+                    style = "display: none;"
+                %>
 
-    ## Tab area, fills entire width
-            <ul class="navbar-nav">
-                <%def name="tab( id, display, href, target='_parent', visible=True, extra_class='', menu_options=None )">
-                    <%
-                    cls = "nav-item"
-                    a_cls = "nav-link"
-                    extra = ""
-                    if extra_class:
-                        cls = extra_class
-                    if self.active_view == id:
-                        cls += " active"
-                    if menu_options:
-                        cls += " dropdown"
-                        a_cls += " dropdown-toggle"
-                        extra = "<b class='caret'></b>"
-                    style = ""
-                    if not visible:
-                        style = "display: none;"
-                    %>
-
-                    <li class="${cls}" style="${style}">
-                      <a
-                        %if href:
-                            class="${a_cls}" target="${target}" href="${href}"
-                        %else:
-                            class="${a_cls}"
-                        %endif
-						%if menu_options:
-							role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
-						%endif
-                        >
-							${display}${extra}
-						</a>
-                        %if menu_options:
-                            <div class="dropdown-menu" aria-labelledby="navbarDropdown">
-                                %for menu_item in menu_options:
-                                    %if not menu_item:
-                                        <div class="dropdown-divider"></div>
+                <li class="${cls}" style="${style}">
+                    <a
+                    %if href:
+                        class="${a_cls}" target="${target}" href="${href}"
+                    %else:
+                        class="${a_cls}"
+                    %endif
+                    %if menu_options:
+                        role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
+                    %endif
+                    >
+                        ${display}${extra}
+                    </a>
+                    %if menu_options:
+                        <div class="dropdown-menu" aria-labelledby="navbarDropdown">
+                            %for menu_item in menu_options:
+                                %if not menu_item:
+                                    <div class="dropdown-divider"></div>
+                                %else:
+                                    %if len ( menu_item ) == 1:
+                                        <a class="dropdown-item" href="javascript:void(0)" role="button">
+                                            ${menu_item[0]}
+                                        </a>
+                                    %elif len ( menu_item ) == 2:
+                                        <% name, link = menu_item %>
+                                        <a class="dropdown-item" href="${link}">${name | h}</a>
                                     %else:
-                                        %if len ( menu_item ) == 1:
-                                            <a class="dropdown-item" href="javascript:void(0)" role="button">
-                                                ${menu_item[0]}
-                                            </a>
-                                        %elif len ( menu_item ) == 2:
-                                            <% name, link = menu_item %>
-                                            <a class="dropdown-item" href="${link}">${name | h}</a>
-                                        %else:
-                                            <% name, link, target = menu_item %>
-                                            <a class="dropdown-item" target="${target}" href="${link}">${name | h}</a>
-                                        %endif
+                                        <% name, link, target = menu_item %>
+                                        <a class="dropdown-item" target="${target}" href="${link}">${name | h}</a>
                                     %endif
-                                %endfor
-                            </div>
-                        %endif
-                    </li>
-                </%def>
+                                %endif
+                            %endfor
+                        </div>
+                    %endif
+                </li>
+            </%def>
 
-                ## Repositories tab.
-                ${tab( "repositories", "Repositories", h.url_for( controller='/repository', action='index' ) )}
+            ## Repositories tab.
+            ${tab( "repositories", "Repositories", h.url_for( controller='/repository', action='index' ) )}
 
-                ## Groups tab.
-                ${tab( "groups", "Groups", h.url_for( controller='/groups', action='index' ) )}
+            ## Groups tab.
+            ${tab( "groups", "Groups", h.url_for( controller='/groups', action='index' ) )}
 
-                ## Admin tab.
-                ${tab( "admin", "Admin", h.url_for( controller='/admin', action='index' ), extra_class="admin-only", visible=( trans.user and app.config.is_admin_user( trans.user ) ) )}
+            ## Admin tab.
+            ${tab( "admin", "Admin", h.url_for( controller='/admin', action='index' ), extra_class="admin-only", visible=( trans.user and app.config.is_admin_user( trans.user ) ) )}
 
-                ## Help tab.
-                <%
-                    menu_options = []
-                    menu_options.extend( [
-                        ['About Tool Shed', app.config.get( "wiki_url", "https://galaxyproject.org/toolshed" ), "_blank" ],
-                        ['Support', app.config.get( "support_url", "https://galaxyproject.org/support" ), "_blank" ],
-                        ['Videos', app.config.get( "screencasts_url", "https://vimeo.com/galaxyproject" ), "_blank" ],
-                        ['How to Cite Tool Shed', app.config.get( "citation_url", "https://galaxyproject.org/citing-galaxy" ), "_blank" ]
-                    ] )
-                    tab( "help", "Help", None, menu_options=menu_options )
-                %>
+            ## Help tab.
+            <%
+                menu_options = []
+                menu_options.extend( [
+                    ['About Tool Shed', app.config.get( "wiki_url", "https://galaxyproject.org/toolshed" ), "_blank" ],
+                    ['Support', app.config.get( "support_url", "https://galaxyproject.org/support" ), "_blank" ],
+                    ['Videos', app.config.get( "screencasts_url", "https://vimeo.com/galaxyproject" ), "_blank" ],
+                    ['How to Cite Tool Shed', app.config.get( "citation_url", "https://galaxyproject.org/citing-galaxy" ), "_blank" ]
+                ] )
+                tab( "help", "Help", None, menu_options=menu_options )
+            %>
 
-                ## User tabs.
-                <%
-                    from markupsafe import escape
-                    # Menu for user who is not logged in.
-                    menu_options = [ [ "Login", h.url_for( controller='/user', action='login' ), "galaxy_main" ] ]
-                    if app.config.allow_user_creation:
-                        menu_options.append( [ "Register", h.url_for( controller='/user', action='create', cntrller='user' ), "galaxy_main" ] )
-                    extra_class = "loggedout-only"
-                    visible = ( trans.user == None )
-                    tab( "user", "User", None, visible=visible, menu_options=menu_options )
-                    # Menu for user who is logged in.
-                    if trans.user:
-                        email = escape( trans.user.email )
-                    else:
-                        email = ""
-                    menu_options = [ [ 'Logged in as <span id="user-email">%s</span>' %  email ] ]
-                    if app.config.use_remote_user:
-                        if app.config.remote_user_logout_href:
-                            menu_options.append( [ 'Logout', app.config.remote_user_logout_href, "_top" ] )
-                    else:
-                        menu_options.append( [ 'Preferences', h.url_for( controller='/user', action='index', cntrller='user' ), "galaxy_main" ] )
-                        menu_options.append( [ 'API Keys', h.url_for( controller='/user', action='api_keys', cntrller='user' ), "galaxy_main" ] )
-                        logout_url = h.url_for( controller='/user', action='logout' )
-                        menu_options.append( [ 'Logout', logout_url, "_top" ] )
-                    if app.config.use_remote_user:
-                        menu_options.append( [ 'Public Name', h.url_for( controller='/user', action='edit_username', cntrller='user' ), "galaxy_main" ] )
+            ## User tabs.
+            <%
+                from markupsafe import escape
+                # Menu for user who is not logged in.
+                menu_options = [ [ "Login", h.url_for( controller='/user', action='login' ), "galaxy_main" ] ]
+                if app.config.allow_user_creation:
+                    menu_options.append( [ "Register", h.url_for( controller='/user', action='create', cntrller='user' ), "galaxy_main" ] )
+                extra_class = "loggedout-only"
+                visible = ( trans.user == None )
+                tab( "user", "User", None, visible=visible, menu_options=menu_options )
+                # Menu for user who is logged in.
+                if trans.user:
+                    email = escape( trans.user.email )
+                else:
+                    email = ""
+                menu_options = [ [ 'Logged in as <span id="user-email">%s</span>' %  email ] ]
+                if app.config.use_remote_user:
+                    if app.config.remote_user_logout_href:
+                        menu_options.append( [ 'Logout', app.config.remote_user_logout_href, "_top" ] )
+                else:
+                    menu_options.append( [ 'Preferences', h.url_for( controller='/user', action='index', cntrller='user' ), "galaxy_main" ] )
+                    menu_options.append( [ 'API Keys', h.url_for( controller='/user', action='api_keys', cntrller='user' ), "galaxy_main" ] )
+                    logout_url = h.url_for( controller='/user', action='logout' )
+                    menu_options.append( [ 'Logout', logout_url, "_top" ] )
+                if app.config.use_remote_user:
+                    menu_options.append( [ 'Public Name', h.url_for( controller='/user', action='edit_username', cntrller='user' ), "galaxy_main" ] )
 
-                    extra_class = "loggedin-only"
-                    visible = ( trans.user != None )
-                    tab( "user", "User", None, visible=visible, menu_options=menu_options )
-                %>
-            </ul>
+                extra_class = "loggedin-only"
+                visible = ( trans.user != None )
+                tab( "user", "User", None, visible=visible, menu_options=menu_options )
+            %>
+        </ul>
+    </nav>
 </%def>
diff --git a/mypy.ini b/mypy.ini
index 8bdb9fc4c67..e04dffe2c5a 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -75,8 +75,6 @@ check_untyped_defs = False
 check_untyped_defs = False
 [mypy-galaxy.tools.bundled.data_source.microbial_import_code]
 check_untyped_defs = False
-[mypy-galaxy.security]
-check_untyped_defs = False
 [mypy-galaxy.datatypes.converters.pileup_to_interval_index_converter]
 check_untyped_defs = False
 [mypy-galaxy.datatypes.converters.bgzip]
@@ -111,8 +109,6 @@ check_untyped_defs = False
 check_untyped_defs = False
 [mypy-galaxy.tools.bundled.filters.random_lines_two_pass]
 check_untyped_defs = False
-[mypy-galaxy.tool_util.verify.asserts.archive]
-check_untyped_defs = False
 [mypy-galaxy.tool_util.deps.brew_exts]
 check_untyped_defs = False
 [mypy-galaxy.model.item_attrs]
@@ -624,8 +620,6 @@ check_untyped_defs = False
 check_untyped_defs = False
 [mypy-integration.test_workflow_sync]
 check_untyped_defs = False
-[mypy-integration.test_workflow_refactoring]
-check_untyped_defs = False
 [mypy-integration.test_tool_data_delete]
 check_untyped_defs = False
 [mypy-integration.test_shed_tool_tests]
@@ -685,8 +679,6 @@ check_untyped_defs = False
 check_untyped_defs = False
 [mypy-*.workflows.test_modules]
 check_untyped_defs = False
-[mypy-*.workflows.test_refactor_models]
-check_untyped_defs = False
 [mypy-*.managers.test_HDAManager]
 check_untyped_defs = False
 [mypy-*.managers.test_DatasetManager]
diff --git a/packages/app/HISTORY.rst b/packages/app/HISTORY.rst
index 33755bffbd4..50b4476dcf6 100644
--- a/packages/app/HISTORY.rst
+++ b/packages/app/HISTORY.rst
@@ -4,11 +4,10 @@ History
 .. to_doc
 
 ---------------------
-20.9.1.dev0
+22.5.0.dev0
 ---------------------
 
 
-
 ---------------------
 20.9.0 (2020-10-15)
 ---------------------
diff --git a/packages/app/setup.cfg b/packages/app/setup.cfg
index 1639cc00577..adc8796fce2 100644
--- a/packages/app/setup.cfg
+++ b/packages/app/setup.cfg
@@ -54,12 +54,13 @@ install_requires =
     lxml
     Mako
     Markdown
-    packaging
+    MarkupSafe
+    packaging<22
     paramiko!=2.9.0,!=2.9.1
     pebble
     pulsar-galaxy-lib>=0.15.0.dev0
     pydantic
-    pysam
+    pysam>=0.20
     PyJWT
     PyYAML
     refgenconf>=0.12.0
diff --git a/packages/auth/HISTORY.rst b/packages/auth/HISTORY.rst
index 33755bffbd4..50b4476dcf6 100644
--- a/packages/auth/HISTORY.rst
+++ b/packages/auth/HISTORY.rst
@@ -4,11 +4,10 @@ History
 .. to_doc
 
 ---------------------
-20.9.1.dev0
+22.5.0.dev0
 ---------------------
 
 
-
 ---------------------
 20.9.0 (2020-10-15)
 ---------------------
diff --git a/packages/build_packages.sh b/packages/build_packages.sh
new file mode 100755
index 00000000000..249b9143df5
--- /dev/null
+++ b/packages/build_packages.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# Builds packages, sets new versions, but doesn't upload anything to pypi.
+# Set DEV_RELEASE=1 to build the dev of packages.
+
+set -ex
+
+# Change to packages directory.
+cd "$(dirname "$0")"
+
+# ensure ordered by dependency dag
+while read -r package_dir; do
+    printf "\n========= RELEASING PACKAGE ${package_dir} =========\n\n"
+
+    cd "$package_dir"
+
+    make clean
+    make commit-version
+    make dist
+    make new-version
+
+    cd ..
+done < packages_by_dep_dag.txt
diff --git a/packages/config/HISTORY.rst b/packages/config/HISTORY.rst
index 57c8f32e340..a2b9ae17537 100644
--- a/packages/config/HISTORY.rst
+++ b/packages/config/HISTORY.rst
@@ -3,6 +3,11 @@ History
 
 .. to_doc
 
+---------------------
+22.5.0.dev0
+---------------------
+
+
 ---------------------
 22.1.0.dev0
 ---------------------
diff --git a/packages/data/HISTORY.rst b/packages/data/HISTORY.rst
index d19656791a9..820af5a9ba3 100644
--- a/packages/data/HISTORY.rst
+++ b/packages/data/HISTORY.rst
@@ -4,7 +4,7 @@ History
 .. to_doc
 
 ---------------------
-20.9.1 (2021-03-02)
+22.5.0.dev0
 ---------------------
 
 
diff --git a/packages/data/setup.cfg b/packages/data/setup.cfg
index f429a00e46c..27e9fc753dd 100644
--- a/packages/data/setup.cfg
+++ b/packages/data/setup.cfg
@@ -37,11 +37,11 @@ install_requires =
     alembic
     bdbag
     bx-python
-    contextvars; python_version >= "3.6" and python_version < "3.7"
     dnspython
     galaxy-sequence-utils
     h5py
     isa-rwval
+    MarkupSafe
     mrcfile
     numpy
     parsley
@@ -49,11 +49,11 @@ install_requires =
     pydantic[email]
     pylibmagic
     python-magic
-    pysam
+    pysam>=0.20
     rocrate
     social-auth-core[openidconnect]==4.0.3
     SQLAlchemy>=1.4.25,<2
-    tifffile<=2020.9.3  # Last version compatible with python 3.6
+    tifffile
     typing-extensions
     WebOb
 packages = find:
diff --git a/packages/files/HISTORY.rst b/packages/files/HISTORY.rst
index d3e116b95ec..8c7d8473299 100644
--- a/packages/files/HISTORY.rst
+++ b/packages/files/HISTORY.rst
@@ -4,7 +4,13 @@ History
 .. to_doc
 
 ---------------------
-22.1.0.dev0
+22.5.0.dev0
+---------------------
+
+
+
+---------------------
+22.1.0
 ---------------------
 
 * Initial standalone release of this package.
diff --git a/packages/job_execution/HISTORY.rst b/packages/job_execution/HISTORY.rst
index 33755bffbd4..e37af41e47c 100644
--- a/packages/job_execution/HISTORY.rst
+++ b/packages/job_execution/HISTORY.rst
@@ -4,7 +4,7 @@ History
 .. to_doc
 
 ---------------------
-20.9.1.dev0
+22.5.0.dev0
 ---------------------
 
 
diff --git a/packages/job_metrics/HISTORY.rst b/packages/job_metrics/HISTORY.rst
index 39a22902ac1..3a57dcc18c8 100644
--- a/packages/job_metrics/HISTORY.rst
+++ b/packages/job_metrics/HISTORY.rst
@@ -4,7 +4,7 @@ History
 .. to_doc
 
 ---------------------
-20.9.1.dev0
+22.5.0.dev0
 ---------------------
 
 
diff --git a/packages/meta/HISTORY.rst b/packages/meta/HISTORY.rst
index 135a4eca50a..3fbd85e0bc3 100644
--- a/packages/meta/HISTORY.rst
+++ b/packages/meta/HISTORY.rst
@@ -4,7 +4,13 @@ History
 .. to_doc
 
 ---------------------
-19.9.0.dev0
+22.5.0.dev0
+---------------------
+
+
+
+---------------------
+19.9.0
 ---------------------
 
 * Initial import from dev branch of Galaxy during 19.09 development cycle.
diff --git a/packages/objectstore/HISTORY.rst b/packages/objectstore/HISTORY.rst
index b5eec5587a9..8d167e485d5 100644
--- a/packages/objectstore/HISTORY.rst
+++ b/packages/objectstore/HISTORY.rst
@@ -4,7 +4,7 @@ History
 .. to_doc
 
 ---------------------
-20.9.2.dev0
+22.5.0.dev0
 ---------------------
 
 
@@ -13,7 +13,7 @@ History
 20.9.1 (2021-03-01)
 ---------------------
 
-
+* Second release from the 20.09 branch of Galaxy.
 
 ---------------------
 20.9.0 (2020-10-15)
diff --git a/packages/packages_by_dep_dag.txt b/packages/packages_by_dep_dag.txt
new file mode 100644
index 00000000000..66bd5d1ddc5
--- /dev/null
+++ b/packages/packages_by_dep_dag.txt
@@ -0,0 +1,19 @@
+util
+config
+files
+job_metrics
+navigation
+objectstore
+tool_util
+data
+selenium
+tours
+auth
+job_execution
+web_stack
+web_framework
+app
+webapps
+test_base
+test_driver
+test_api
diff --git a/packages/selenium/HISTORY.rst b/packages/selenium/HISTORY.rst
index 33755bffbd4..e37af41e47c 100644
--- a/packages/selenium/HISTORY.rst
+++ b/packages/selenium/HISTORY.rst
@@ -4,7 +4,7 @@ History
 .. to_doc
 
 ---------------------
-20.9.1.dev0
+22.5.0.dev0
 ---------------------
 
 
diff --git a/packages/selenium/setup.cfg b/packages/selenium/setup.cfg
index f25aa4a2a4a..74f7511f7fd 100644
--- a/packages/selenium/setup.cfg
+++ b/packages/selenium/setup.cfg
@@ -31,7 +31,8 @@ version = 22.5.0.dev0
 [options]
 include_package_data = True
 install_requires =
-    galaxy-data
+    galaxy-navigation
+    galaxy-util
     PyYAML
     requests
     selenium
diff --git a/packages/test.sh b/packages/test.sh
index ee0cef696b5..90d0e225cfc 100755
--- a/packages/test.sh
+++ b/packages/test.sh
@@ -18,30 +18,8 @@ pip install --upgrade pip setuptools wheel
 pip install -r../lib/galaxy/dependencies/pinned-typecheck-requirements.txt
 
 # ensure ordered by dependency DAG
-# TODO: add selenium in once type issues are cleared up
-PACKAGE_DIRS=(
-    util
-    objectstore
-    job_metrics
-    config
-    files
-    tool_util
-    data
-    job_execution
-    auth
-    web_stack
-    web_framework
-    navigation
-    tours
-    app
-    webapps
-    test_base
-    test_driver
-    test_api
-)
-for ((i=0; i<${#PACKAGE_DIRS[@]}; i++)); do
-    printf "\n========= TESTING PACKAGE ${PACKAGE_DIRS[$i]} =========\n\n"
-    package_dir=${PACKAGE_DIRS[$i]}
+while read -r package_dir; do
+    printf "\n========= TESTING PACKAGE ${package_dir} =========\n\n"
 
     cd "$package_dir"
 
@@ -63,4 +41,4 @@ for ((i=0; i<${#PACKAGE_DIRS[@]}; i++)); do
     pytest $unit_extra -m 'not external_dependency_management' . || test $? -eq 5
     make mypy
     cd ..
-done
+done < packages_by_dep_dag.txt
diff --git a/packages/test_api/HISTORY.rst b/packages/test_api/HISTORY.rst
index 51ac670bf30..597ec1aee55 100644
--- a/packages/test_api/HISTORY.rst
+++ b/packages/test_api/HISTORY.rst
@@ -4,7 +4,7 @@ History
 .. to_doc
 
 ---------------------
-20.9.1.dev0
+22.5.0.dev0
 ---------------------
 
 
@@ -14,4 +14,3 @@ History
 ---------------------
 
 * Initial import from dev branch of Galaxy during 20.09 branch of Galaxy.
-
diff --git a/packages/test_base/HISTORY.rst b/packages/test_base/HISTORY.rst
index d2dc6c23d48..328748b8c88 100644
--- a/packages/test_base/HISTORY.rst
+++ b/packages/test_base/HISTORY.rst
@@ -4,7 +4,7 @@ History
 .. to_doc
 
 ---------------------
-20.9.1.dev0
+22.5.0.dev0
 ---------------------
 
 
diff --git a/packages/test_driver/HISTORY.rst b/packages/test_driver/HISTORY.rst
index 33755bffbd4..e37af41e47c 100644
--- a/packages/test_driver/HISTORY.rst
+++ b/packages/test_driver/HISTORY.rst
@@ -4,7 +4,7 @@ History
 .. to_doc
 
 ---------------------
-20.9.1.dev0
+22.5.0.dev0
 ---------------------
 
 
diff --git a/packages/test_selenium/HISTORY.rst b/packages/test_selenium/HISTORY.rst
index 5549c967c14..8672d24edec 100644
--- a/packages/test_selenium/HISTORY.rst
+++ b/packages/test_selenium/HISTORY.rst
@@ -4,7 +4,7 @@ History
 .. to_doc
 
 ---------------------
-20.9.1.dev0
+22.5.0.dev0
 ---------------------
 
 
diff --git a/packages/tool_util/HISTORY.rst b/packages/tool_util/HISTORY.rst
index 0e8821a2ce4..3591c254f83 100644
--- a/packages/tool_util/HISTORY.rst
+++ b/packages/tool_util/HISTORY.rst
@@ -3,6 +3,13 @@ History
 
 .. to_doc
 
+-------------------
+22.5.0.dev0
+-------------------
+
+
+
+-------------------
 22.1.5 (2022-11-14)
 -------------------
 
diff --git a/packages/tool_util/setup.cfg b/packages/tool_util/setup.cfg
index 7f2db40b020..cf9990cf587 100644
--- a/packages/tool_util/setup.cfg
+++ b/packages/tool_util/setup.cfg
@@ -34,7 +34,7 @@ install_requires =
     galaxy-util>=22.1
     lxml
     MarkupSafe
-    packaging
+    packaging<22
     pydantic
     PyYAML
     requests
diff --git a/packages/util/HISTORY.rst b/packages/util/HISTORY.rst
index 347af52a24e..d8e909830f5 100644
--- a/packages/util/HISTORY.rst
+++ b/packages/util/HISTORY.rst
@@ -4,11 +4,24 @@ History
 .. to_doc
 
 ---------------------
-21.1.1.dev0
+22.5.0.dev0
 ---------------------
 
 
 
+---------------------
+22.1.2 (2022-12-08)
+---------------------
+
+* Pin packaging dependency to < 22, fixes ``LegacyVersion`` import errors
+* Add missing pyparsing dependency
+
+---------------------
+22.1.1 (2022-08-22)
+---------------------
+
+* First release from the 22.01 branch of Galaxy
+
 ---------------------
 21.1.0 (2021-03-19)
 ---------------------
diff --git a/packages/util/setup.cfg b/packages/util/setup.cfg
index 440d7c66f3a..7a0ddbe6179 100644
--- a/packages/util/setup.cfg
+++ b/packages/util/setup.cfg
@@ -35,9 +35,8 @@ install_requires =
     boltons
     docutils
     importlib_resources
-    MarkupSafe
-    packaging
-    pycryptodome
+    packaging<22  # packaging 22.0 dropped LegacyVersion
+    pyparsing
     PyYAML
     requests
     Routes
diff --git a/packages/web_framework/HISTORY.rst b/packages/web_framework/HISTORY.rst
index 33755bffbd4..e37af41e47c 100644
--- a/packages/web_framework/HISTORY.rst
+++ b/packages/web_framework/HISTORY.rst
@@ -4,7 +4,7 @@ History
 .. to_doc
 
 ---------------------
-20.9.1.dev0
+22.5.0.dev0
 ---------------------
 
 
diff --git a/packages/web_stack/HISTORY.rst b/packages/web_stack/HISTORY.rst
index 50c3d53334d..ebd300dc274 100644
--- a/packages/web_stack/HISTORY.rst
+++ b/packages/web_stack/HISTORY.rst
@@ -4,7 +4,7 @@ History
 .. to_doc
 
 ---------------------
-20.5.1.dev0
+22.5.0.dev0
 ---------------------
 
 
diff --git a/packages/webapps/HISTORY.rst b/packages/webapps/HISTORY.rst
index 50c3d53334d..ebd300dc274 100644
--- a/packages/webapps/HISTORY.rst
+++ b/packages/webapps/HISTORY.rst
@@ -4,7 +4,7 @@ History
 .. to_doc
 
 ---------------------
-20.5.1.dev0
+22.5.0.dev0
 ---------------------
 
 
diff --git a/pyproject.toml b/pyproject.toml
index a208e858e7b..b1e7c1f6e1a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,6 @@ extend-exclude = '''
   | packages
 )/
 '''
-force-exclude = 'lib/galaxy/util/jstree.py'
 
 [tool.darker]
 isort = true
@@ -50,12 +49,12 @@ dictobj = "*"
 dnspython = "*"
 docutils = "!=0.17, !=0.17.1"
 edam-ontology = "*"
-fastapi = ">=0.71.0"  # https://github.com/tiangolo/fastapi/issues/4041
+fastapi = ">=0.71.0, !=0.89.0"  # https://github.com/tiangolo/fastapi/issues/4041 https://github.com/tiangolo/fastapi/issues/5861
 fastapi-utils = "*"
 fs = "*"
 future = "*"
 galaxy_sequence_utils = "*"
-gravity = ">=0.10.0"
+gravity = {git = "https://github.com/galaxyproject/gravity.git", branch = "release_1.x"}  # https://github.com/galaxyproject/gravity/issues/92
 gunicorn = "*"
 gxformat2 = "*"
 h5py = "*"
@@ -70,6 +69,7 @@ Mercurial = "*"
 mrcfile = "*"
 nodeenv = "*"
 numpy = "*"
+packaging = "<22"  # packaging 22.0 dropped LegacyVersion
 paramiko = "!=2.9.0, !=2.9.1"  # https://github.com/paramiko/paramiko/issues/1961
 Parsley = "*"
 Paste = "*"
@@ -82,7 +82,7 @@ PyJWT = "*"
 pykwalify = "*"
 pylibmagic = "*"
 pyparsing = "*"
-pysam = "*"
+pysam = ">=0.20"
 python = ">=3.7,<3.11"  # Keep maximum version strict to appease numpy and scipy
 python-dateutil = "*"
 python-magic = "*"
@@ -114,7 +114,8 @@ zipstream-new = "*"
 [tool.poetry.group.dev.dependencies]
 ase = ">=3.18.1"
 black = "^22.1.0"
-cwltest = "2.2.20210901154959"
+codespell = "*"
+cwltest = "*"
 darker = "*"
 fluent-logger = "*"
 httpx = "*"
@@ -136,6 +137,7 @@ pytest-shard = "*"
 recommonmark = "*"
 responses = "*"
 selenium = "*"
+seletools = "*"
 Sphinx = ">=4.0"  # support docutils 0.17
 sphinx_markdown_tables = "*"
 sphinx_rtd_theme = ">=1.0.0"
@@ -144,3 +146,27 @@ testfixtures = "*"
 tuspy = "*"
 twill = "*"
 watchdog = "*"
+
+[tool.ruff]
+select = ["E", "F", "B", "UP"]
+target-version = "py37"
+# Exceptions:
+# B008 Do not perform function calls in argument defaults (for FastAPI Depends and Body)
+# B9 flake8-bugbear opinionated warnings
+# E402 module level import not at top of file # TODO, we would like to improve this.
+# E501 is line length (delegated to black)
+ignore = ["B008", "B9", "E402", "E501"]
+
+[tool.ruff.isort]
+# We are not selecting "I" rules in ruff yet because support for all the isort
+# options we need is not complete, but these are the one currently implemented.
+combine-as-imports = true
+relative-imports-order = "closest-to-furthest"
+
+[tool.ruff.per-file-ignores]
+# Don't check pyupgrade rules on tool scripts, which may use different Python versions
+"test/functional/tools/*" = ["UP"]
+"tools/*" = ["UP"]
+
+[tool.ruff.pyupgrade]
+keep-runtime-typing = true  # https://github.com/charliermarsh/ruff/issues/1617
diff --git a/run_tests.sh b/run_tests.sh
index 926f2bffd22..55427eae0e3 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -4,9 +4,6 @@ cd "$(dirname "$0")"
 
 show_help() {
 cat <<EOF
-'${0##*/} -id bbb'                  for testing one tool with id 'bbb' ('bbb' is the tool id)
-'${0##*/} -sid ccc'                 for testing one section with sid 'ccc' ('ccc' is the string after 'section::')
-'${0##*/} -list'                    for listing all the tool ids
 '${0##*/} -api (test_path)'         for running all the test scripts in the ./lib/galaxy_test/api directory, test_path
                                     can be pytest selector
 '${0##*/} -cwl (test_path)'         for running all the test scripts in the ./lib/galaxy_test/api/cwl directory, test_path
@@ -14,7 +11,6 @@ cat <<EOF
 '${0##*/} -integration (test_path)' for running all integration test scripts in the ./test/integration directory, test_path
                                     can be pytest selector
 '${0##*/} -toolshed (test_path)'    for running all the test scripts in the ./lib/tool_shed/test directory
-'${0##*/} -installed'               for running tests of Tool Shed installed tools
 '${0##*/} -main'                    for running tests of tools shipped with Galaxy
 '${0##*/} -framework'               for running through example tool tests testing framework features in test/functional/tools"
 '${0##*/} -framework -id toolid'    for testing one framework tool (in test/functional/tools/) with id 'toolid'
@@ -240,8 +236,8 @@ GALAXY_TEST_SHED_TOOL_CONF      Shed toolbox conf (defaults to
                                 config/shed_tool_conf.xml) used when testing
                                 installed to tools with -installed.
 GALAXY_TEST_HISTORY_ID          Some tests can target existing history ids, this option
-                                is fairly limited and not compatible with parrallel testing
-                                so should be limited to debugging one off tests.
+                                is fairly limited and not compatible with parallel testing
+                                so should be limited to debugging one-off tests.
 TOOL_SHED_TEST_HOST             Host to use for shed server setup for testing.
 TOOL_SHED_TEST_PORT             Port to use for shed server setup for testing.
 TOOL_SHED_TEST_FILE_DIR         Defaults to lib/tool_shed/test/test_data.
@@ -297,7 +293,6 @@ if [ -n "$BUILD_NUMBER" ]; then
     xunit_report_file="xunit-${BUILD_NUMBER}.xml"
 fi
 
-run_default_functional_tests="1"
 # Loop through and consume the main arguments.
 # Some loops will consume more than one argument (there are extra "shift"s in some cases).
 while :
@@ -307,10 +302,6 @@ do
           show_help
           exit 0
           ;;
-      -l|-list|--list)
-          show_list
-          exit 0
-          ;;
       -id|--id)
           if [ $# -gt 1 ]; then
               test_id=$2;
@@ -320,15 +311,6 @@ do
               exit 1
           fi
           ;;
-      -s|-sid|--sid)
-          if [ $# -gt 1 ]; then
-              section_id=$2
-              shift 2
-          else
-              echo "--sid requires an argument" 1>&2
-              exit 1
-          fi
-          ;;
       -a|-api|--api)
           GALAXY_TEST_USE_HIERARCHICAL_OBJECT_STORE="True"  # Run these tests with a non-trivial object store.
           export GALAXY_TEST_USE_HIERARCHICAL_OBJECT_STORE
@@ -409,32 +391,18 @@ do
           framework_test=1;
           shift 1
           ;;
-      -main|-main_tools|--main_tools)
-          GALAXY_TEST_TOOL_CONF="lib/galaxy/config/sample/tool_conf.xml.sample"
-          marker="tool"
-          report_file="run_framework_tests.html"
-          framework_test=1;
-          shift 1
-          ;;
       -d|-data_managers|--data_managers)
           marker="data_manager"
           report_file="run_data_managers_tests.html"
           data_managers_test=1;
           shift 1
           ;;
-      -m|-migrated|--migrated)
-          GALAXY_TEST_TOOL_CONF="config/migrated_tools_conf.xml"
+      -main|-main_tools|--main_tools)
+          GALAXY_TEST_TOOL_CONF="lib/galaxy/config/sample/tool_conf.xml.sample"
           marker="tool"
-          report_file="run_migrated_tests.html"
-          migrated_test=1;
-          shift
-          ;;
-      -installed|--installed)
-          GALAXY_TEST_TOOL_CONF="config/shed_tool_conf.xml"
-          marker="tool"
-          report_file="run_installed_tests.html"
-          installed_test=1;
-          shift
+          report_file="run_framework_tests.html"
+          framework_test=1;
+          shift 1
           ;;
       -r|--report_file)
           if [ $# -gt 1 ]; then
@@ -555,7 +523,6 @@ do
       --)
           # Do not default to running the functional tests in this case, caller
           # is opting to run specific tests so don't interfere with that by default.
-          unset run_default_functional_tests;
           shift
           break
           ;;
@@ -589,7 +556,7 @@ fi
 
 setup_python
 
-if [ -n "$framework_test" ] || [ -n "$installed_test" ] || [ -n "$migrated_test" ] || [ -n "$data_managers_test" ] ; then
+if [ -n "$framework_test" ] || [ -n "$data_managers_test" ] ; then
     if [ -n "$test_id" ]; then
         selector="-k $test_id"
     else
@@ -602,16 +569,12 @@ elif [ -n "$toolshed_script" ]; then
     extra_args="$toolshed_script"
 elif [ -n "$api_script" ]; then
     extra_args="$api_script"
-elif [ -n "$section_id" ]; then
-    extra_args=$(python tool_list.py "$section_id")
 elif [ -n "$unit_extra" ]; then
     extra_args="$unit_extra"
 elif [ -n "$integration_extra" ]; then
     extra_args="$integration_extra"
 elif [ -n "$test_target" ] ; then
     extra_args="$test_target"
-elif [ -n "$run_default_functional_tests" ] ; then
-    extra_args='--exclude="^get" functional'
 else
     extra_args=""
 fi
diff --git a/scripts/bootstrap_history.py b/scripts/bootstrap_history.py
index e342181312e..c83ddaf021e 100644
--- a/scripts/bootstrap_history.py
+++ b/scripts/bootstrap_history.py
@@ -206,6 +206,14 @@ RELEASE_ISSUE_TEMPLATE = string.Template(
 
           make release-create-rc
 
+    - [ ] Create dev packages:
+
+          cd packages && DEV_RELEASE=1 ./build_packages.sh
+
+
+    - [ ] Review created packages (HISTORY.rst correct, setup.cfg correct, correct version in filename)
+    - [ ] Upload galaxy-util & galaxy-tool-util dev packages to pypi
+    - [ ] Open PR against planemo with a pin to the dev packages
     - [ ] Open PRs from your fork of branch ``version-${version}`` to upstream ``release_${version}`` and of ``version-${next_version}.dev`` to ``dev``.
     - [ ] Update ``MILESTONE_NUMBER`` in the [maintenance bot](https://github.com/galaxyproject/galaxy/blob/dev/.github/workflows/maintenance_bot.yaml) to `${next_version}` so it properly tags new PRs.
 
@@ -263,6 +271,13 @@ RELEASE_ISSUE_TEMPLATE = string.Template(
 
           make release-create
 
+    - [ ] Create dev packages:
+
+          cd packages && ./build_packages.sh
+
+
+    - [ ] Review created packages (HISTORY.rst correct, setup.cfg correct, correct version in filename)
+    - [ ] Upload built packages to pypi
     - [ ] Add the branch `*/release_{version}` to Jenkins documentation build [configuration matrix](https://jenkins.galaxyproject.org/job/galaxy-sphinx-by-branch/configure).
     - [ ] Trigger the [branch documentation build](https://jenkins.galaxyproject.org/job/galaxy-sphinx-by-branch/)
     - [ ] Verify that everything is merged from ${version}->master, and then trigger the ['latest' documentation build](https://jenkins.galaxyproject.org/job/latest-Sphinx-Docs/)
diff --git a/scripts/dump_openapi_schema.py b/scripts/dump_openapi_schema.py
index fc7ff469742..3215a9b73e5 100644
--- a/scripts/dump_openapi_schema.py
+++ b/scripts/dump_openapi_schema.py
@@ -6,18 +6,34 @@ sys.path.insert(1, os.path.abspath(os.path.join(os.path.dirname(__file__), os.pa
 
 import click
 import yaml
+from pydantic.networks import (
+    AnyUrl,
+    url_regex,
+)
 
 from galaxy.webapps.galaxy.fast_app import get_openapi_schema
 
 
+def _any_url_representer(dumper, data):
+    return dumper.represent_scalar("!anyurl", str(data))
+
+
+class YamlDumper(yaml.SafeDumper):
+    pass
+
+
+YamlDumper.add_representer(AnyUrl, _any_url_representer)
+YamlDumper.add_implicit_resolver("!anyurl", url_regex(), None)
+
+
 @click.command("Write openapi schema to path")
 @click.argument("schema_path", type=click.Path(dir_okay=False, writable=True), required=False)
 def write_open_api_schema(schema_path):
     openapi_schema = get_openapi_schema()
     if schema_path:
-        if schema_path.endswith((".yml", ".yml")):
+        if schema_path.endswith((".yml", ".yaml")):
             with open(schema_path, "w") as f:
-                yaml.safe_dump(openapi_schema, f)
+                yaml.dump(openapi_schema, f, YamlDumper)
         else:
             with open(schema_path, "w") as f:
                 json.dump(openapi_schema, f, sort_keys=True)
diff --git a/static/favicon.png b/static/favicon.png
deleted file mode 100644
index ada8725c8c0..00000000000
Binary files a/static/favicon.png and /dev/null differ
diff --git a/static/favicon.svg b/static/favicon.svg
new file mode 100644
index 00000000000..e45841ba083
--- /dev/null
+++ b/static/favicon.svg
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 685.29999 207.8"
+   enable-background="new 0 0 612 194"
+   xml:space="preserve"
+   sodipodi:docname="favicon.svg"
+   inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
+   width="685.29999"
+   height="207.8"><metadata
+   id="metadata4265"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs4263" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1423"
+   inkscape:window-height="830"
+   id="namedview4261"
+   showgrid="false"
+   inkscape:pagecheckerboard="true"
+   inkscape:zoom="1.0543273"
+   inkscape:cx="341.34705"
+   inkscape:cy="115.54204"
+   inkscape:window-x="277"
+   inkscape:window-y="25"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="Layer_1"
+   inkscape:showpageshadow="2"
+   inkscape:deskcolor="#d1d1d1"
+   inkscape:document-rotation="0"
+   fit-margin-top="40"
+   lock-margins="true"
+   fit-margin-left="40"
+   fit-margin-right="40"
+   fit-margin-bottom="40"
+   showguides="false" />
+<font
+   horiz-adv-x="1000"
+   id="font4231"
+   horiz-origin-x="0"
+   horiz-origin-y="0"
+   vert-origin-x="512"
+   vert-origin-y="768"
+   vert-adv-y="1024">
+<!-- Copyright (c) 2011 Natanael Gama (exo@ndiscovered.com), with Reserved Font Name &quot;Exo&quot; -->
+<!-- Copyright: Copyright 2016 Adobe System Incorporated. All rights reserved. -->
+<font-face
+   font-family="Exo-ExtraLight"
+   units-per-em="1000"
+   underline-position="-75"
+   underline-thickness="50"
+   id="font-face4205" />
+<missing-glyph
+   horiz-adv-x="784"
+   d="M657,506l-252,-240l252,-241M140,13l507,0l-253,243M127,22l256,244l-256,241M648,518l-511,0l257,-242M113,0l0,531l558,0l0,-531z"
+   id="missing-glyph4207" />
+<glyph
+   unicode=" "
+   horiz-adv-x="269"
+   id="glyph4209" />
+<glyph
+   unicode="B"
+   horiz-adv-x="597"
+   d="M98,0l0,732l263,0C429,732 478,715 507,681C536,647 551,605 551,556C551,507 540,467 519,437C497,407 469,389 435,383C463,376 490,358 516,327C542,296 555,255 555,204C555,148 542,101 516,64C486,21 434,0 361,0M140,42l221,0C463,42 514,97 514,206C514,250 500,287 471,317C442,347 407,362 364,362C363,362 362,362 361,362l-221,0M140,404l221,0C406,404 441,417 468,442C496,467 510,505 510,554C510,645 460,691 361,691l-221,0z"
+   id="glyph4211" />
+<glyph
+   unicode="C"
+   horiz-adv-x="572"
+   d="M68,368C68,521 91,624 138,676C177,719 234,740 311,740C374,740 449,732 535,716l0,-30C524,687 515,688 506,689C497,690 487,690 476,691C464,692 451,693 438,694C424,695 410,695 396,696C373,698 340,699 299,699C258,699 223,690 195,672C138,634 109,532 109,366C109,145 177,35 312,35C374,35 437,37 502,42l33,3l0,-29C456,1 382,-6 311,-6C149,-6 68,119 68,368z"
+   id="glyph4213" />
+<glyph
+   unicode="H"
+   horiz-adv-x="655"
+   d="M98,0l0,732l41,0l0,-358l410,0l0,358l41,0l0,-732l-41,0l0,334l-410,0l0,-334z"
+   id="glyph4215" />
+<glyph
+   unicode="I"
+   horiz-adv-x="204"
+   d="M98,0l0,732l41,0l0,-732z"
+   id="glyph4217" />
+<glyph
+   unicode="M"
+   horiz-adv-x="798"
+   d="M68,0l69,732l59,0l207,-663l202,663l59,0l75,-732l-41,0l-69,667l-204,-667l-44,0l-208,667l-64,-667z"
+   id="glyph4219" />
+<glyph
+   unicode="N"
+   horiz-adv-x="670"
+   d="M98,0l0,732l43,0l423,-655l0,655l41,0l0,-732l-41,0l-425,655l0,-655z"
+   id="glyph4221" />
+<glyph
+   unicode="O"
+   horiz-adv-x="675"
+   d="M594,611C615,560 626,477 626,361C626,240 612,150 583,93C570,66 551,46 527,32C503,17 478,8 452,3C426,-2 395,-4 359,-4C322,-4 293,-3 271,0C249,3 227,8 204,17C181,25 162,37 149,54C136,70 123,91 112,118C101,145 93,178 88,219C83,259 80,310 80,371C80,432 84,485 93,532C102,578 113,615 127,642C140,669 160,689 185,704C210,718 234,727 259,731C284,735 314,737 349,737C384,737 413,736 435,733C456,730 478,725 501,716C524,707 542,695 556,678C569,661 582,638 594,611M138,550C132,527 128,500 125,469C122,437 121,393 121,338C121,282 125,233 133,191C140,148 154,116 174,93C194,70 217,55 244,48C271,41 307,37 353,37C398,37 434,41 461,49C488,56 511,71 531,94C551,117 565,149 573,192C581,235 585,289 585,356C585,422 582,476 575,518C568,559 559,592 548,616C537,639 521,657 500,669C479,681 458,689 438,692C417,695 393,696 365,696C336,696 316,696 303,695C290,694 275,693 258,690C241,687 227,682 217,676C207,669 196,661 185,650C173,639 164,626 157,609C150,592 144,573 138,550z"
+   id="glyph4223" />
+<glyph
+   unicode="T"
+   horiz-adv-x="595"
+   d="M46,691l0,41l515,0l0,-41l-240,0l0,-691l-41,0l0,691z"
+   id="glyph4225" />
+<glyph
+   unicode="U"
+   horiz-adv-x="680"
+   d="M98,320l0,412l41,0l0,-412C139,251 144,197 153,157C162,116 179,88 203,71C227,54 249,44 268,41C287,38 317,36 359,36l1,0C437,36 487,49 511,76C541,109 560,152 567,204C572,237 574,276 574,320l0,412l42,0l0,-412C616,215 603,139 576,92C567,76 558,63 550,52C541,41 530,31 516,24C502,17 490,11 481,8C471,4 458,1 441,-1C419,-4 400,-5 383,-5C366,-5 352,-5 341,-5C330,-5 319,-5 310,-4C300,-4 286,-3 269,-1C251,0 237,3 228,7C219,10 207,16 193,24C179,31 168,40 161,51C153,62 144,75 135,92C126,108 119,127 114,148C103,202 98,259 98,320z"
+   id="glyph4227" />
+<glyph
+   unicode="Y"
+   horiz-adv-x="622"
+   d="M336,0l-41,0l0,260l-239,472l45,0l215,-422l234,422l46,0l-260,-472z"
+   id="glyph4229" />
+</font>
+
+	<path
+   fill="#ffffff"
+   d="M 124.8,82.2 H 41.9 C 40.8,82.2 40,81.3 40,80.3 V 58.7 c 0,-1.1 0.9,-1.9 1.9,-1.9 h 82.9 c 1.1,0 1.9,0.9 1.9,1.9 V 80 c 0,1.1 -0.7,2.2 -1.9,2.2 z"
+   id="path4233" />
+<path
+   fill="#ffffff"
+   d="M 102.6,115.5 H 42.1 C 41,115.5 40,114.6 40,113.4 V 92.2 c 0,-1.1 0.9,-2.1 2.1,-2.1 h 60.5 c 1.1,0 2.1,0.9 2.1,2.1 v 21.2 c 0,1.2 -0.9,2.1 -2.1,2.1 z"
+   id="path4235" />
+<linearGradient
+   id="SVGID_1_"
+   gradientUnits="userSpaceOnUse"
+   x1="61.400002"
+   y1="117.4396"
+   x2="175.7851"
+   y2="117.4396"
+   gradientTransform="matrix(0.7601,0,0,0.7601,23.0196,46.352)">
+	<stop
+   offset="0.1656"
+   style="stop-color:#D0BD2B"
+   id="stop4237" />
+	<stop
+   offset="1"
+   style="stop-color:#D0BD2B;stop-opacity:0"
+   id="stop4239" />
+</linearGradient>
+<path
+   fill="url(#SVGID_1_)"
+   d="M 154.6,148.3 H 71.7 c -1.1,0 -2.1,-0.9 -2.1,-2.1 V 125 c 0,-1.1 0.9,-2.1 2.1,-2.1 h 82.7 c 1.1,0 2.1,0.9 2.1,2.1 v 21.2 c 0,1.2 -0.9,2.1 -1.9,2.1 z"
+   id="path4242"
+   style="fill:url(#SVGID_1_)" />
+<g
+   id="g4256"
+   transform="translate(28.9,34.8)">
+	<path
+   fill="#ffffff"
+   d="m 239.6,100.8 c -4.4,1.6 -10.1,3.4 -17.1,4.9 -7.2,1.6 -14.3,2.5 -21.3,2.5 -16.4,0 -29.3,-4.4 -38.6,-13.4 -9.3,-9 -13.9,-21.3 -13.9,-37 0,-15 4.8,-27.2 14.1,-36.3 9.3,-9.2 22.6,-13.8 39.3,-13.8 6.3,0 12.3,0.5 18.2,1.8 5.8,1.1 12.2,3.4 19.2,6.9 V 39 h -2.8 c -1.2,-0.9 -3,-2.1 -5.3,-3.9 -2.3,-1.8 -4.6,-3.2 -6.7,-4.2 -2.5,-1.4 -5.5,-2.6 -8.8,-3.5 -3.4,-1.1 -6.9,-1.6 -10.8,-1.6 -4.4,0 -8.5,0.7 -12,1.9 -3.5,1.2 -6.9,3.4 -9.7,6 -2.8,2.6 -4.9,6 -6.5,9.9 -1.6,4.1 -2.3,8.6 -2.3,13.8 0,10.8 2.8,18.9 8.5,24.5 5.6,5.6 14.1,8.5 25.2,8.5 1.1,0 1.9,0 3.2,0 1.1,0 2.1,0 3.2,-0.2 v -19 H 195.5 V 53 H 240 Z"
+   id="path4244" />
+	<path
+   fill="#ffffff"
+   d="m 298.7,98.7 c -1.2,1.1 -2.8,2.1 -4.8,3.4 -1.8,1.4 -3.7,2.5 -5.3,3.2 -2.3,1.1 -4.8,1.8 -7.2,2.3 -2.5,0.5 -5.1,0.7 -8.1,0.7 -6.9,0 -12.7,-2.1 -17.5,-6.5 -4.8,-4.2 -7.1,-9.7 -7.1,-16.4 0,-5.3 1.2,-9.7 3.5,-13.1 2.3,-3.4 5.8,-6 10.1,-7.9 4.2,-1.9 9.7,-3.4 16,-4.2 6.3,-0.9 13.1,-1.4 19.9,-1.8 V 58 c 0,-4.1 -1.6,-6.9 -4.9,-8.3 -3.4,-1.6 -8.1,-2.3 -14.5,-2.3 -3.9,0 -7.9,0.7 -12.3,2.1 -4.4,1.4 -7.6,2.5 -9.3,3.2 h -2.1 V 35 c 2.5,-0.7 6.5,-1.4 12.2,-2.3 5.5,-0.9 11.1,-1.4 16.8,-1.4 13.2,0 22.9,2.1 28.7,6.2 5.8,4.1 8.8,10.4 8.8,19.2 v 49.6 h -23.1 z m 0,-11.5 v -15 c -3.2,0.2 -6.5,0.5 -10.2,1.1 -3.7,0.6 -6.5,1.1 -8.3,1.6 -2.3,0.7 -4.1,1.8 -5.3,3.2 -1.2,1.4 -1.8,3.4 -1.8,5.5 0,1.6 0.2,2.8 0.4,3.7 0.2,1.1 0.9,1.8 1.9,2.8 1.1,0.9 2.1,1.6 3.5,1.9 1.4,0.4 3.5,0.5 6.5,0.5 2.3,0 4.8,-0.5 7.2,-1.4 2.2,-1 4.3,-2.3 6.1,-3.9 z"
+   id="path4246" />
+	<path
+   fill="#ffffff"
+   d="M 361,106.3 H 337.5 V 5.2 H 361 Z"
+   id="path4248" />
+	<path
+   fill="#ffffff"
+   d="m 421.1,98.7 c -1.2,1.1 -2.8,2.1 -4.8,3.4 -1.8,1.4 -3.7,2.5 -5.3,3.2 -2.3,1.1 -4.8,1.8 -7.2,2.3 -2.5,0.5 -5.1,0.7 -8.1,0.7 -6.9,0 -12.7,-2.1 -17.5,-6.5 -4.8,-4.2 -7.1,-9.7 -7.1,-16.4 0,-5.3 1.2,-9.7 3.5,-13.1 2.3,-3.4 5.8,-6 10.1,-7.9 4.4,-1.9 9.7,-3.4 16,-4.2 6.3,-0.9 13.1,-1.4 19.9,-1.8 V 58 c 0,-4.1 -1.6,-6.9 -4.9,-8.3 -3.4,-1.6 -8.1,-2.3 -14.5,-2.3 -3.9,0 -7.9,0.7 -12.3,2.1 -4.4,1.4 -7.6,2.5 -9.3,3.2 h -2.1 V 35 c 2.5,-0.7 6.5,-1.4 12.2,-2.3 5.5,-0.9 11.1,-1.4 16.8,-1.4 13.2,0 22.9,2.1 28.7,6.2 6,4.1 8.8,10.4 8.8,19.2 v 49.6 h -23.1 z m 0,-11.5 v -15 c -3.2,0.2 -6.5,0.5 -10.2,1.1 -3.7,0.6 -6.5,1.1 -8.3,1.6 -2.3,0.7 -4.1,1.8 -5.3,3.2 -1.2,1.4 -1.8,3.4 -1.8,5.5 0,1.6 0.2,2.8 0.4,3.7 0.2,1.1 0.9,1.8 1.9,2.8 1.1,0.9 2.1,1.6 3.5,1.9 1.4,0.4 3.5,0.5 6.5,0.5 2.3,0 4.8,-0.5 7.2,-1.4 2.2,-1 4.3,-2.3 6.1,-3.9 z"
+   id="path4250" />
+	<path
+   fill="#ffffff"
+   d="m 536.1,106.3 h -27.3 l -15.5,-21.7 -16,21.9 H 450.5 L 479.1,70 450.9,33.5 h 27.3 L 493.6,55 508.9,33.5 h 26.8 l -28.4,36 z"
+   id="path4252" />
+	<path
+   fill="#ffffff"
+   d="m 575.8,80.5 16.6,-47.1 h 24 L 575.8,133 H 550.4 L 562,105.7 533.8,33.4 h 24.5 z"
+   id="path4254" />
+</g>
+
+</svg>
diff --git a/templates/base.mako b/templates/base.mako
index 2fe2a3c247f..f36d4d53b98 100644
--- a/templates/base.mako
+++ b/templates/base.mako
@@ -9,6 +9,17 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
+        <!-- Set meta description -->
+        <%
+            if request.path.startswith('/login'):
+                meta_description = "Log in to Galaxy to get access to more tools and resources. Register now for a free account."
+            elif request.path.startswith('/workflows'):
+                meta_description = "Galaxy Workflows facilitate rigorous, reproducible analysis pipelines that can be shared with the community."
+            else:
+                meta_description = "Galaxy is a community-driven web-based analysis platform for life science research."
+        %>
+        <meta name="description" content="${meta_description}" />
+
         <title>
             Galaxy
             %if app.config.brand:
diff --git a/templates/js-app.mako b/templates/js-app.mako
index 57bb1744af9..0c6e16d4df3 100644
--- a/templates/js-app.mako
+++ b/templates/js-app.mako
@@ -5,6 +5,17 @@
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
+        <!-- Set meta description -->
+        <%
+            if request.path.startswith('/login'):
+                meta_description = "Log in to Galaxy to get access to more tools and resources. Register now for a free account."
+            elif request.path.startswith('/workflows'):
+                meta_description = "Galaxy Workflows facilitate rigorous, reproducible analysis pipelines that can be shared with the community."
+            else:
+                meta_description = "Galaxy is a community-driven web-based analysis platform for life science research."
+        %>
+        <meta name="description" content="${meta_description}" />
+
         <title>
             Galaxy
             %if app.config.brand:
diff --git a/templates/webapps/reports/base_panels.mako b/templates/webapps/reports/base_panels.mako
index 38512c5dcd8..5e4b8e7cb0b 100644
--- a/templates/webapps/reports/base_panels.mako
+++ b/templates/webapps/reports/base_panels.mako
@@ -39,7 +39,7 @@
     </div>
     ## Logo, layered over tabs to be clickable
     <a class="navbar-brand" href="${h.url_for( app.config.get( 'logo_url', '/' ) )}">
-        <img class="navbar-brand-image" src="${h.url_for('/static/favicon.png')}" />
+        <img class="navbar-brand-image" src="${h.url_for('/static/favicon.svg')}" />
         <span class="navbar-brand-title">Galaxy Reports</span>
         %if app.config.brand:
             <span class='brand'>/ ${app.config.brand}</span>
diff --git a/test-data/2.cram b/test-data/2.cram
index dacd2d459e3..5176d57f864 100644
Binary files a/test-data/2.cram and b/test-data/2.cram differ
diff --git a/test/functional/tools/resource_requirements.xml b/test/functional/tools/resource_requirements.xml
index 5ad4ccc06fd..96a5641f720 100644
--- a/test/functional/tools/resource_requirements.xml
+++ b/test/functional/tools/resource_requirements.xml
@@ -6,6 +6,11 @@
         <resource type="ram_max">2></resource>
         <resource type="tmpdir_min"><![CDATA[$(inputs.input1.size)]]></resource>
         <resource type="tmpdir_max"><![CDATA[$(inputs.input1.size * 2)]]></resource>
+        <resource type="cuda_version_min">10.2</resource>
+        <resource type="cuda_compute_capability">6.1</resource>
+        <resource type="gpu_memory_min">4042</resource>
+        <resource type="cuda_device_count_min">1</resource>
+        <resource type="cuda_device_count_max">2</resource>
     </requirements>
     <command><![CDATA[
 echo "\$GALAXY_SLOTS" > $output
diff --git a/test/integration/test_galaxy_interactor.py b/test/integration/test_galaxy_interactor.py
index c1c7a5a9eeb..2924d4732f3 100644
--- a/test/integration/test_galaxy_interactor.py
+++ b/test/integration/test_galaxy_interactor.py
@@ -22,15 +22,16 @@ class TestGalaxyInteractor(integration_util.IntegrationTestCase):
     def test_get_tool_tests(self):
         # test that get_tool_tests will return the right tests when the tool_version has a '+' in it
         test_data = self.galaxy_interactor.get_tool_tests(tool_id="multiple_versions", tool_version="0.1+galaxy6")
-        print(test_data)
         assert isinstance(test_data, list)
         assert len(test_data) > 0
-        assert isinstance(test_data[0], dict)
-        assert test_data[0].get("tool_version") == "0.1+galaxy6"
+        test_data_dict = test_data[0]
+        assert isinstance(test_data_dict, dict)
+        assert test_data_dict.get("tool_version") == "0.1+galaxy6"
 
         test_data = self.galaxy_interactor.get_tool_tests(
             tool_id="multiple_versions"
         )  # test that tool_version=None does not break it
         assert isinstance(test_data, list)
         assert len(test_data) > 0
-        assert isinstance(test_data[0], dict)
+        test_data_dict = test_data[0]
+        assert isinstance(test_data_dict, dict)
diff --git a/test/integration/test_history_import_export.py b/test/integration/test_history_import_export.py
index b1b7f4728a7..dee793f21b6 100644
--- a/test/integration/test_history_import_export.py
+++ b/test/integration/test_history_import_export.py
@@ -119,6 +119,63 @@ class TestImportExportHistoryViaTasksIntegration(
         assert imported_history_id != history_id
         assert imported_history["name"] == history_name
 
+    def test_export_tracking(self):
+        history_name = f"for_export_tracking_{uuid4()}"
+        history_id = self.dataset_populator.setup_history_for_export_testing(history_name)
+        model_store_format = "rocrate.zip"
+        target_uri = f"gxfiles://posix_test/history.{model_store_format}"
+
+        # Initially there are no export records
+        export_records = self.dataset_populator.get_history_export_tasks(history_id)
+        assert len(export_records) == 0
+
+        # Export to a remote file source
+        self.dataset_populator.export_history_to_uri_async(history_id, target_uri, model_store_format)
+        export_records = self.dataset_populator.get_history_export_tasks(history_id)
+        assert len(export_records) == 1
+        last_record = export_records[0]
+        self._wait_for_export_task_on_record(last_record)
+        assert last_record["ready"] is True
+
+        # Check metadata
+        assert last_record["up_to_date"] is True
+        assert last_record["export_metadata"]
+        assert last_record["export_metadata"]["request_data"]
+        assert last_record["export_metadata"]["request_data"]["payload"]
+        assert last_record["export_metadata"]["request_data"]["payload"]["target_uri"] == target_uri
+        assert last_record["export_metadata"]["result_data"]
+        assert last_record["export_metadata"]["result_data"]["success"] is True
+
+        # Track temporal direct download
+        self.dataset_populator.download_history_to_store(history_id)
+        # We should have two records now
+        export_records = self.dataset_populator.get_history_export_tasks(history_id)
+        assert len(export_records) == 2
+        last_record = export_records[0]
+        self._wait_for_export_task_on_record(last_record)
+        assert last_record["ready"] is True
+
+        # Check metadata
+        assert last_record["up_to_date"] is True
+        assert last_record["export_metadata"]
+        assert last_record["export_metadata"]["request_data"]
+        assert last_record["export_metadata"]["request_data"]["payload"]
+        assert last_record["export_metadata"]["request_data"]["payload"]["short_term_storage_request_id"] is not None
+        assert last_record["export_metadata"]["request_data"]["payload"]["duration"] is not None
+        assert last_record["export_metadata"]["result_data"]
+        assert last_record["export_metadata"]["result_data"]["success"] is True
+
+        # After modifying the history the records must be outdated
+        self.dataset_populator.new_dataset(history_id)
+        export_records = self.dataset_populator.get_history_export_tasks(history_id)
+        for record in export_records:
+            assert record["up_to_date"] is False
+
+    def _wait_for_export_task_on_record(self, record):
+        if record["preparing"]:
+            assert record["task_uuid"]
+            self.dataset_populator.wait_on_task_id(record["task_uuid"])
+
 
 class TestImportExportHistoryContentsViaTasksIntegration(IntegrationTestCase, UsesCeleryTasks):
     dataset_populator: DatasetPopulator
diff --git a/test/integration/test_interactivetools_api.py b/test/integration/test_interactivetools_api.py
index fa2f62066dd..96d5c8d5882 100644
--- a/test/integration/test_interactivetools_api.py
+++ b/test/integration/test_interactivetools_api.py
@@ -152,6 +152,14 @@ class TestInteractiveToolsPulsarIntegration(AbstractTestCases.BaseInteractiveToo
         disable_dependency_resolution(config)
 
 
+class TestInteractiveToolsShortURLIntegration(AbstractTestCases.BaseInteractiveToolsIntegrationTestCase):
+    @classmethod
+    def handle_galaxy_config_kwds(cls, config):
+        super().handle_galaxy_config_kwds(config)
+        config["interactivetools_shorten_url"] = True
+        config["job_config_file"] = DOCKERIZED_JOB_CONFIG_FILE
+
+
 class TestInteractiveToolsRemoteProxyIntegration(AbstractTestCases.BaseInteractiveToolsIntegrationTestCase):
     """
     $ cd gx-it-proxy
diff --git a/test/integration/test_tool_data_bundles.py b/test/integration/test_tool_data_bundles.py
new file mode 100644
index 00000000000..67eca7e3a04
--- /dev/null
+++ b/test/integration/test_tool_data_bundles.py
@@ -0,0 +1,73 @@
+import os
+
+from galaxy.util.compression_utils import decompress_bytes_to_directory
+from .test_tool_data_delete import DataManagerIntegrationTestCase
+
+
+class TestDataBundlesIntegration(DataManagerIntegrationTestCase):
+    def test_admin_build_data_bundle_by_uri(self):
+        original_count = self._testbeta_field_count()
+
+        history_id = self.dataset_populator.new_history()
+        payload = self.dataset_populator.run_tool_payload(
+            tool_id="data_manager",
+            inputs={"ignored_value": "moo"},
+            data_manager_mode="bundle",
+            history_id=history_id,
+        )
+        create_response = self._post("tools", data=payload)
+        create_response.raise_for_status()
+        self.dataset_populator.wait_for_history(history_id, assert_ok=True)
+        data_manager_dataset = self.dataset_populator.get_history_dataset_details(history_id)
+        assert data_manager_dataset["extension"] == "data_manager_json"
+
+        post_job_count = self._testbeta_field_count()
+        assert original_count == post_job_count
+
+        content = self.dataset_populator.get_history_dataset_content(
+            history_id, to_ext="data_manager_json", type="bytes"
+        )
+        temp_directory = decompress_bytes_to_directory(content)
+        uri = f"file://{os.path.normpath(temp_directory)}"
+        data = {
+            "source": {
+                "src": "uri",
+                "uri": uri,
+            }
+        }
+        task_summary_response = self._post("tool_data", data=data, json=True)
+        self.dataset_populator.wait_on_task(task_summary_response)
+
+        post_import_count = self._testbeta_field_count()
+        assert original_count + 1 == post_import_count
+
+    def test_admin_build_data_bundle_by_dataset(self):
+        original_count = self._testbeta_field_count()
+
+        history_id = self.dataset_populator.new_history()
+        payload = self.dataset_populator.run_tool_payload(
+            tool_id="data_manager",
+            inputs={"ignored_value": "moo"},
+            data_manager_mode="bundle",
+            history_id=history_id,
+        )
+        create_response = self._post("tools", data=payload)
+        create_response.raise_for_status()
+        self.dataset_populator.wait_for_history(history_id, assert_ok=True)
+        data_manager_dataset = self.dataset_populator.get_history_dataset_details(history_id)
+        assert data_manager_dataset["extension"] == "data_manager_json"
+
+        post_job_count = self._testbeta_field_count()
+        assert original_count == post_job_count
+
+        data = {
+            "source": {
+                "src": "hda",
+                "id": data_manager_dataset["id"],
+            }
+        }
+        task_summary_response = self._post("tool_data", data=data, json=True)
+        self.dataset_populator.wait_on_task(task_summary_response)
+
+        post_import_count = self._testbeta_field_count()
+        assert original_count + 1 == post_import_count
diff --git a/test/integration/test_tool_data_delete.py b/test/integration/test_tool_data_delete.py
index c9c5a2eed47..fcc8ed28b97 100644
--- a/test/integration/test_tool_data_delete.py
+++ b/test/integration/test_tool_data_delete.py
@@ -17,8 +17,10 @@ THIS_DIR = os.path.dirname(__file__)
 SOURCE_TOOL_DATA_DIRECTORY = os.path.join(THIS_DIR, os.pardir, "functional", "tool-data")
 
 
-class TestAdminToolDataIntegration(integration_util.IntegrationTestCase):
+class DataManagerIntegrationTestCase(integration_util.IntegrationTestCase):
+
     require_admin_user = True
+    dataset_populator: DatasetPopulator
 
     def setUp(self):
         super().setUp()
@@ -38,10 +40,18 @@ class TestAdminToolDataIntegration(integration_util.IntegrationTestCase):
         config["tool_data_path"] = cls.temp_tool_data_dir
         config["tool_data_table_config_path"] = cls.temp_tool_data_tables_file
 
-    def test_admin_delete_data_table_entry(self):
+    def _testbase_fields(self):
         show_response = self._get("tool_data/testbeta")
-        original_count = len(show_response.json()["fields"])
+        show_response.raise_for_status()
+        return show_response.json()["fields"]
 
+    def _testbeta_field_count(self) -> int:
+        return len(self._testbase_fields())
+
+
+class TestAdminToolDataIntegration(DataManagerIntegrationTestCase):
+    def test_admin_delete_data_table_entry(self):
+        original_count = self._testbeta_field_count()
         history_id = self.dataset_populator.new_history()
         payload = self.dataset_populator.run_tool_payload(
             tool_id="data_manager",
@@ -52,8 +62,7 @@ class TestAdminToolDataIntegration(integration_util.IntegrationTestCase):
         create_response.raise_for_status()
         self.dataset_populator.wait_for_history(history_id, assert_ok=True)
         time.sleep(2)
-        show_response = self._get("tool_data/testbeta")
-        updated_fields = show_response.json()["fields"]
+        updated_fields = self._testbase_fields()
         assert len(updated_fields) == original_count + 1
         new_field = updated_fields[-1]
         url = self._api_url(f"tool_data/testbeta?key={self.galaxy_interactor.api_key}")
diff --git a/test/integration/test_user_preferences.py b/test/integration/test_user_preferences.py
new file mode 100644
index 00000000000..9ce0f0ed316
--- /dev/null
+++ b/test/integration/test_user_preferences.py
@@ -0,0 +1,32 @@
+from typing import (
+    Any,
+    cast,
+)
+
+from requests import (
+    get,
+    put,
+)
+
+from galaxy_test.driver import integration_util
+
+TEST_USER_EMAIL = "test_user_preferences@bx.psu.edu"
+
+
+class TestUserPreferences(integration_util.IntegrationTestCase):
+    def test_user_theme(self):
+        user = self._setup_user(TEST_USER_EMAIL)
+        url = self._api_url(f"users/{user['id']}/theme/test_theme", params=dict(key=self.master_api_key))
+        app = cast(Any, self._test_driver.app if self._test_driver else None)
+        db_user = app.model.context.query(app.model.User).filter(app.model.User.email == user["email"]).first()
+
+        # create some initial data
+        put(url)
+
+        # retrieve saved data
+        url = self._api_url(f"users/{user['id']}", params=dict(key=self.master_api_key))
+        response = get(url).json()
+
+        # value should be what we saved and should be part of the user response
+        assert db_user.preferences["theme"] == "test_theme"
+        assert response["preferences"]["theme"] == "test_theme"
diff --git a/test/integration/test_workflow_refactoring.py b/test/integration/test_workflow_refactoring.py
index 4b18ff81380..a6680a30b0d 100644
--- a/test/integration/test_workflow_refactoring.py
+++ b/test/integration/test_workflow_refactoring.py
@@ -1,5 +1,10 @@
 import contextlib
 import json
+from typing import (
+    Any,
+    Dict,
+    List,
+)
 
 from galaxy.managers.context import ProvidesAppContext
 from galaxy.managers.workflows import RefactorRequest
@@ -38,6 +43,9 @@ steps:
       input1: test_input
 """
 
+ActionJson = Dict[str, Any]
+ActionsJson = List[ActionJson]
+
 
 class TestWorkflowRefactoringIntegration(integration_util.IntegrationTestCase, UsesShedApi):
 
@@ -50,7 +58,7 @@ class TestWorkflowRefactoringIntegration(integration_util.IntegrationTestCase, U
     def test_basic_refactoring_types(self):
         self.workflow_populator.upload_yaml_workflow(REFACTORING_SIMPLE_TEST)
 
-        actions = [
+        actions: ActionsJson = [
             {"action_type": "update_name", "name": "my cool new name"},
         ]
         self._refactor(actions)
@@ -187,7 +195,7 @@ class TestWorkflowRefactoringIntegration(integration_util.IntegrationTestCase, U
     def test_basic_refactoring_types_dry_run(self):
         self.workflow_populator.upload_yaml_workflow(REFACTORING_SIMPLE_TEST)
 
-        actions = [
+        actions: ActionsJson = [
             {"action_type": "update_name", "name": "my cool new name"},
         ]
         response = self._dry_run(actions)
@@ -247,7 +255,7 @@ class TestWorkflowRefactoringIntegration(integration_util.IntegrationTestCase, U
     def test_refactoring_legacy_parameters(self):
         wf = self.workflow_populator.load_workflow_from_resource("test_workflow_randomlines_legacy_params")
         self.workflow_populator.create_workflow(wf)
-        actions = [
+        actions: ActionsJson = [
             {"action_type": "extract_untyped_parameter", "name": "seed"},
             {"action_type": "extract_untyped_parameter", "name": "num", "label": "renamed_num"},
         ]
@@ -302,7 +310,7 @@ steps:
         rename: "${pja_only_param} name"
 """
         )
-        actions = [
+        actions: ActionsJson = [
             {"action_type": "extract_untyped_parameter", "name": "pja_only_param"},
         ]
         self._refactor(actions)
@@ -325,7 +333,7 @@ steps:
         rename: "${pja_only_param} name"
 """
         )
-        actions = [
+        actions: ActionsJson = [
             {"action_type": "extract_untyped_parameter", "name": "pja_only_param"},
         ]
         response = self._dry_run(actions)
@@ -351,7 +359,7 @@ steps:
         rename: "${pja_only_param} name"
 """
         )
-        actions = [
+        actions: ActionsJson = [
             {"action_type": "extract_untyped_parameter", "name": "pja_only_param", "label": "new_label"},
         ]
         self._refactor(actions)
@@ -367,7 +375,7 @@ steps:
         self.workflow_populator.create_workflow(wf)
         only_step = self._latest_workflow.step_by_index(0)
         assert len(only_step.workflow_outputs) == 1
-        actions = [
+        actions: ActionsJson = [
             {"action_type": "remove_unlabeled_workflow_outputs"},
         ]
         self._refactor(actions)
@@ -396,7 +404,7 @@ steps:
 
     def test_refactor_works_with_subworkflows(self):
         self.workflow_populator.upload_yaml_workflow(WORKFLOW_NESTED_SIMPLE)
-        actions = [
+        actions: ActionsJson = [
             {"action_type": "update_step_label", "step": {"label": "nested_workflow"}, "label": "new_nested_workflow"},
         ]
         self._refactor(actions)
@@ -429,7 +437,7 @@ steps:
         assert self._latest_workflow.step_by_index(1).tool_id == "random-missing"
         assert "num_lines" in self._latest_workflow.step_by_index(1).tool_inputs
 
-        actions = [
+        actions: ActionsJson = [
             {"action_type": "update_step_label", "step": {"order_index": 1}, "label": "random2_new"},
         ]
         self._refactor(actions)
@@ -438,7 +446,7 @@ steps:
 
     def test_refactor_fill_step_defaults(self):
         self._load_two_random_lines_wf_with_missing_state()
-        actions = [
+        actions: ActionsJson = [
             {"action_type": "fill_step_defaults", "step": {"order_index": 0}},
         ]
         action_executions = self._refactor(actions).action_executions
@@ -458,7 +466,7 @@ steps:
 
     def test_refactor_fill_step_defaults_dry_run(self):
         self._load_two_random_lines_wf_with_missing_state()
-        actions = [
+        actions: ActionsJson = [
             {"action_type": "fill_step_defaults", "step": {"order_index": 0}},
         ]
         response = self._dry_run(actions)
@@ -481,7 +489,7 @@ steps:
 
     def test_refactor_fill_defaults(self):
         self._load_two_random_lines_wf_with_missing_state()
-        actions = [
+        actions: ActionsJson = [
             {"action_type": "fill_defaults"},
         ]
         action_executions = self._refactor(actions).action_executions
@@ -516,7 +524,7 @@ steps:
 """
         )
         assert self._latest_workflow.step_by_label("the_step").tool_version == "0.1"
-        actions = [
+        actions: ActionsJson = [
             {"action_type": "upgrade_tool", "step": {"label": "the_step"}},
         ]
         # t = self._app.toolbox.get_tool("multiple_versions", tool_version="0.1")
@@ -540,7 +548,7 @@ steps:
 """
         )
         assert self._latest_workflow.step_by_label("the_step").tool_version == "0.1"
-        actions = [
+        actions: ActionsJson = [
             {"action_type": "upgrade_tool", "step": {"label": "the_step"}, "tool_version": "0.2"},
         ]
         action_executions = self._refactor(actions).action_executions
@@ -575,7 +583,7 @@ steps:
         pre_upgrade_native = self._download_native(self._most_recent_stored_workflow)
         self._assert_nested_workflow_num_lines_is(pre_upgrade_native, "1")
 
-        actions = [
+        actions: ActionsJson = [
             {"action_type": "upgrade_subworkflow", "step": {"label": "nested_workflow"}},
         ]
         response = self._dry_run(actions)
@@ -603,7 +611,7 @@ steps:
         nested_stored_workflow = self._recent_stored_workflow(2)
         assert len(nested_stored_workflow.workflows) == 3
         middle_workflow_id = self._app.security.encode_id(nested_stored_workflow.workflows[1].id)
-        actions = [
+        actions: ActionsJson = [
             {
                 "action_type": "upgrade_subworkflow",
                 "step": {"label": "nested_workflow"},
@@ -758,7 +766,7 @@ steps:
         with self.workflow_populator.export_for_update(workflow_id) as workflow_object:
             yield workflow_object
 
-    def _refactor(self, actions, stored_workflow=None, dry_run=False, style="ga"):
+    def _refactor(self, actions: List[Dict[str, Any]], stored_workflow=None, dry_run=False, style="ga"):
         user = self._app.model.session.query(User).order_by(User.id.desc()).limit(1).one()
         mock_trans = MockTrans(self._app, user)
 
@@ -776,9 +784,9 @@ steps:
                 RefactorRequest(actions=actions, dry_run=dry_run, style=style),
             )
         finally:
-            app = url_for = original_url_for
+            app.url_for = original_url_for
 
-    def _dry_run(self, actions, stored_workflow=None):
+    def _dry_run(self, actions: ActionsJson, stored_workflow=None):
         # Do a bunch of checks to ensure nothing workflow related was written to the database
         # or even added to the sa_session.
         sa_session = self._app.model.session
@@ -887,3 +895,7 @@ class MockTrans(ProvidesAppContext):
     @property
     def app(self):
         return self._app
+
+    @property
+    def url_builder(self) -> None:
+        return None
diff --git a/lib/galaxy_test/selenium/test_history_export.py b/test/integration_selenium/test_history_export.py
similarity index 88%
rename from lib/galaxy_test/selenium/test_history_export.py
rename to test/integration_selenium/test_history_export.py
index 3571a8cd7bb..9675f85b620 100644
--- a/lib/galaxy_test/selenium/test_history_export.py
+++ b/test/integration_selenium/test_history_export.py
@@ -1,12 +1,16 @@
 from .framework import (
     selenium_test,
-    SeleniumTestCase,
+    SeleniumIntegrationTestCase,
 )
 
 
-class TestHistoryExport(SeleniumTestCase):
+class TestHistoryExport(SeleniumIntegrationTestCase):
     ensure_registered = True
 
+    @classmethod
+    def handle_galaxy_config_kwds(cls, config):
+        config["enable_celery_tasks"] = False
+
     @selenium_test
     def test_history_export(self):
         self.perform_upload_of_pasted_content("my cool content")
diff --git a/test/integration_selenium/test_history_import_export_ftp.py b/test/integration_selenium/test_history_import_export_ftp.py
index d7111c0bc5e..29a3ac46efa 100644
--- a/test/integration_selenium/test_history_import_export_ftp.py
+++ b/test/integration_selenium/test_history_import_export_ftp.py
@@ -6,12 +6,16 @@ from .framework import (
 )
 
 
-class TestHistoryImportExportFtpSeleniumIntegration(SeleniumIntegrationTestCase):
+class TestHistoryImportExportFtpSeleniumIntegrationBase(SeleniumIntegrationTestCase):
     ensure_registered = True
 
     @classmethod
     def handle_galaxy_config_kwds(cls, config):
         super().handle_galaxy_config_kwds(config)
+        cls.setup_ftp_config(config)
+
+    @classmethod
+    def setup_ftp_config(cls, config):
         ftp_dir = cls.ftp_dir()
         os.makedirs(ftp_dir)
         config["ftp_upload_dir"] = ftp_dir
@@ -21,12 +25,29 @@ class TestHistoryImportExportFtpSeleniumIntegration(SeleniumIntegrationTestCase)
     def ftp_dir(cls):
         return cls.temp_config_dir("ftp")
 
-    @selenium_test
-    def test_history_import_export(self):
+    def create_user_ftp_dir(self):
         email = self.get_logged_in_user()["email"]
         user_ftp_dir = os.path.join(self.ftp_dir(), email)
         os.makedirs(user_ftp_dir)
 
+    def _export_to_ftp_with_filename(self, filename: str):
+        self.components.history_export.directory_input.wait_for_and_click()
+        self.components.files_dialog.ftp_label.wait_for_and_click()
+        self.components.upload.file_dialog_ok.wait_for_and_click()
+        self.components.history_export.name_input.wait_for_and_send_keys(filename)
+        self.components.history_export.export_button.wait_for_and_click()
+
+
+class TestHistoryImportExportFtpSeleniumIntegration(TestHistoryImportExportFtpSeleniumIntegrationBase):
+    @classmethod
+    def handle_galaxy_config_kwds(cls, config):
+        # Setup only FTP without Celery
+        cls.setup_ftp_config(config)
+
+    @selenium_test
+    def test_history_import_export(self):
+        self.create_user_ftp_dir()
+
         gx_selenium_context = self
         gx_selenium_context.perform_upload_of_pasted_content("my cool content")
         gx_selenium_context.history_panel_wait_for_hid_ok(1)
@@ -39,14 +60,8 @@ class TestHistoryImportExportFtpSeleniumIntegration(SeleniumIntegrationTestCase)
         history_export.export_link.wait_for_visible()
         history_export.tab_export_to_file.wait_for_and_click()
         history_export.export_link.wait_for_absent_or_hidden()
-        history_export.directory_input.wait_for_and_click()
 
-        # open directory by clicking on its name
-        files_dialog.ftp_label.wait_for_and_click()
-        self.components.upload.file_dialog_ok.wait_for_and_click()
-
-        history_export.name_input.wait_for_and_send_keys("my_export.tar.gz")
-        history_export.export_button.wait_for_and_click()
+        self._export_to_ftp_with_filename("my_export.tar.gz")
 
         history_export.running.wait_for_visible()
         history_export.running.wait_for_absent(wait_type=gx_selenium_context.wait_types.JOB_COMPLETION)
@@ -68,3 +83,60 @@ class TestHistoryImportExportFtpSeleniumIntegration(SeleniumIntegrationTestCase)
         gx_selenium_context.navigate_to_histories_page()
         newest_history_name = gx_selenium_context.histories_get_history_names()[0]
         assert newest_history_name.startswith("imported from archive")
+
+
+class TestHistoryImportExportFtpSeleniumIntegrationWithTasks(TestHistoryImportExportFtpSeleniumIntegrationBase):
+    @classmethod
+    def handle_galaxy_config_kwds(cls, config):
+        super().handle_galaxy_config_kwds(config)
+
+    @selenium_test
+    def test_history_export_tracking(self):
+        self.create_user_ftp_dir()
+
+        self.perform_upload_of_pasted_content("my cool content")
+        self.history_panel_wait_for_hid_ok(1)
+
+        self.click_history_option_export_to_file()
+
+        # Export to direct download link
+        export_format = "rocrate.zip"
+        history_export_tasks = self.components.history_export_tasks
+        history_export_tasks.direct_download.wait_for_and_click()
+
+        self._verify_last_export_record(expected_format=export_format, is_download=True)
+
+        # Change export format
+        export_format = "tar.gz"
+        history_export_tasks.toggle_options_link.wait_for_and_click()
+        history_export_tasks.export_format_selector.wait_for_visible()
+        history_export_tasks.select_format(format=export_format).wait_for_and_click()
+        history_export_tasks.toggle_options_link.wait_for_and_click()
+
+        # Export to FTP file source
+        history_export_tasks.file_source_tab.wait_for_and_click()
+        self._export_to_ftp_with_filename("my_export.tar.gz")
+
+        self._verify_last_export_record(expected_format=export_format)
+
+    def _verify_last_export_record(
+        self, expected_format: str, expect_up_to_date: bool = True, is_download: bool = False
+    ):
+        last_export_record = self.components.last_export_record
+        last_export_record.preparing_export.wait_for_visible()
+        last_export_record.preparing_export.wait_for_absent(wait_type=self.wait_types.DATABASE_OPERATION)
+
+        last_export_record.details.wait_for_visible()
+        format_element = last_export_record.export_format.wait_for_visible()
+        assert format_element.text == expected_format
+
+        if expect_up_to_date:
+            last_export_record.up_to_date_icon.wait_for_visible()
+        else:
+            last_export_record.outdated_icon.wait_for_visible()
+
+        if is_download:
+            last_export_record.expiration_warning_icon.wait_for_visible()
+            last_export_record.download_btn.wait_for_visible()
+        else:
+            last_export_record.reimport_btn.wait_for_visible()
diff --git a/test/integration_selenium/test_trs_import.py b/test/integration_selenium/test_trs_import.py
index 4fc4c0f4d23..0b5d5be293f 100644
--- a/test/integration_selenium/test_trs_import.py
+++ b/test/integration_selenium/test_trs_import.py
@@ -2,14 +2,16 @@ import os
 
 from .framework import SeleniumIntegrationTestCase
 
-TRS_CONFIG = """
-- api_url: https://dockstore.org/api
+TRS_API_URL_DOCKSTORE = "https://dockstore.org/api"
+TRS_API_URL_WORKFLOWHUB = "https://workflowhub.eu"
+TRS_CONFIG = f"""
+- api_url: {TRS_API_URL_DOCKSTORE}
   doc: 'Dockstore is an open platform used by the GA4GH for sharing Docker-based tools
     and workflows.'
   id: dockstore
   label: dockstore
   link_url: https://dockstore.org
-- api_url: https://workflowhub.eu
+- api_url: {TRS_API_URL_WORKFLOWHUB}
   doc: 'WorkflowHub is a registry of scientific workflows.'
   id: workflowhub
   label: workflowhub
@@ -23,6 +25,10 @@ TRS_VERSION_DOCKSTORE = "v0.4"
 TRS_ID_WORKFLOWHUB = "110"
 TRS_VERSION_WORKFLOWHUB = "4"
 WORKFLOW_NAME = "COVID-19: variation analysis on ARTIC PE data"
+TRS_URL_DOCKSTORE = f"{TRS_API_URL_DOCKSTORE}/ga4gh/trs/v2/tools/%23{TRS_ID_DOCKSTORE}/versions/{TRS_VERSION_DOCKSTORE}"
+TRS_URL_WORKFLOWHUB = (
+    f"{TRS_API_URL_WORKFLOWHUB}/ga4gh/trs/v2/tools/{TRS_ID_WORKFLOWHUB}/versions/{TRS_VERSION_WORKFLOWHUB}"
+)
 
 
 class TestTrsImport(SeleniumIntegrationTestCase):
@@ -99,6 +105,20 @@ class TestTrsImport(SeleniumIntegrationTestCase):
     def test_import_by_id_workflowhub(self):
         self._import_by_id(TRS_ID_WORKFLOWHUB, server="workflowhub")
 
+    def test_import_by_trs_url_dockstore(self):
+        self._import_by_trs_url(TRS_URL_DOCKSTORE)
+
+    def test_import_by_trs_url_workflowhub(self):
+        self._import_by_trs_url(TRS_URL_WORKFLOWHUB)
+
+    def test_auto_import_by_trs_url_dockstore(self):
+        import_url = f"workflows/trs_import?trs_url={TRS_URL_DOCKSTORE}"
+        self._import_workflow_by_url(import_url)
+
+    def test_auto_import_by_trs_url_workflowhub(self):
+        import_url = f"workflows/trs_import?trs_url={TRS_URL_WORKFLOWHUB}"
+        self._import_workflow_by_url(import_url)
+
     def _import_by_id(self, trs_id, server):
         self.go_to_trs_by_id()
         self.components.trs_import.select_server_button.wait_for_and_click()
@@ -108,3 +128,11 @@ class TestTrsImport(SeleniumIntegrationTestCase):
         self.sleep_for(self.wait_types.UX_RENDER)
         self.workflow_index_open()
         self.assert_workflow_imported(WORKFLOW_NAME)
+
+    def _import_by_trs_url(self, trs_url):
+        self.go_to_trs_by_id()
+        self.components.trs_import.url_input.wait_for_and_send_keys(trs_url)
+        self.components.trs_import.url_import_button.wait_for_and_click()
+        self.sleep_for(self.wait_types.UX_RENDER)
+        self.workflow_index_open()
+        self.assert_workflow_imported(WORKFLOW_NAME)
diff --git a/test/unit/app/managers/test_HDAManager.py b/test/unit/app/managers/test_HDAManager.py
index 41373a18256..2bbdf1b2ba4 100644
--- a/test/unit/app/managers/test_HDAManager.py
+++ b/test/unit/app/managers/test_HDAManager.py
@@ -495,9 +495,9 @@ class TestHDASerializer(HDATestCase):
         self.log("file_name should be skipped for non-admin when not exposed by config")
         self.app.config.expose_dataset_path = False
         serialized = self.hda_serializer.serialize(hda, keys, user=None)
-        assert not ("file_name" in serialized)
+        assert "file_name" not in serialized
         serialized = self.hda_serializer.serialize(hda, keys, user=owner)
-        assert not ("file_name" in serialized)
+        assert "file_name" not in serialized
 
         self.log("file_name should be sent for admin in either case")
         serialized = self.hda_serializer.serialize(hda, keys, user=self.admin_user)
diff --git a/test/unit/app/managers/test_JobConnectionsManager.py b/test/unit/app/managers/test_JobConnectionsManager.py
new file mode 100644
index 00000000000..844b4dbdcdf
--- /dev/null
+++ b/test/unit/app/managers/test_JobConnectionsManager.py
@@ -0,0 +1,126 @@
+import pytest
+from sqlalchemy import union
+
+from galaxy.managers.job_connections import JobConnectionsManager
+from galaxy.model import (
+    HistoryDatasetAssociation,
+    HistoryDatasetCollectionAssociation,
+    Job,
+)
+from galaxy.model.scoped_session import galaxy_scoped_session
+from galaxy.model.unittest_utils import GalaxyDataTestApp
+
+
+@pytest.fixture
+def sa_session():
+    return GalaxyDataTestApp().model.session
+
+
+@pytest.fixture
+def job_connections_manager(sa_session) -> JobConnectionsManager:
+    gm = JobConnectionsManager(sa_session)
+    return gm
+
+
+# =============================================================================
+def setup_connected_dataset(sa_session: galaxy_scoped_session):
+    center_hda = HistoryDatasetAssociation(sa_session=sa_session)
+    input_hda = HistoryDatasetAssociation(sa_session=sa_session)
+    input_hdca = HistoryDatasetCollectionAssociation()
+    output_hda = HistoryDatasetAssociation(sa_session=sa_session)
+    output_hdca = HistoryDatasetCollectionAssociation()
+    input_job = Job()
+    output_job = Job()
+    input_job.add_output_dataset("output_hda", center_hda)
+    input_job.add_input_dataset("input_hda", input_hda)
+    input_job.add_input_dataset_collection("input_hdca", input_hdca)
+    output_job.add_input_dataset("input_hda", center_hda)
+    output_job.add_output_dataset("output_hda", output_hda)
+    output_job.add_output_dataset_collection("output_hdca", output_hdca)
+    sa_session.add_all([center_hda, input_hda, input_hdca, output_hdca, input_job, output_job])
+    sa_session.flush()
+    expected_graph = {
+        "inputs": [
+            {"src": "HistoryDatasetAssociation", "id": input_hda.id},
+            {"src": "HistoryDatasetCollectionAssociation", "id": input_hdca.id},
+        ],
+        "outputs": [
+            {"src": "HistoryDatasetAssociation", "id": output_hda.id},
+            {"src": "HistoryDatasetCollectionAssociation", "id": output_hdca.id},
+        ],
+    }
+    return center_hda, expected_graph
+
+
+def setup_connected_dataset_collection(sa_session: galaxy_scoped_session):
+    center_hdca = HistoryDatasetCollectionAssociation()
+    input_hda1 = HistoryDatasetAssociation(sa_session=sa_session)
+    input_hda2 = HistoryDatasetAssociation(sa_session=sa_session)
+    input_hdca = HistoryDatasetCollectionAssociation()
+    output_hda = HistoryDatasetAssociation(sa_session=sa_session)
+    output_hdca = HistoryDatasetCollectionAssociation()
+    input_job = Job()
+    output_job = Job()
+    input_job.add_output_dataset_collection("output_hdca", center_hdca)
+    input_job.add_input_dataset("input_hda", input_hda1)
+    input_job.add_input_dataset("input_hda", input_hda2)
+    input_job.add_input_dataset_collection("input_hdca", input_hdca)
+    output_job.add_input_dataset_collection("input_hdca", center_hdca)
+    output_job.add_output_dataset("output_hda", output_hda)
+    output_job.add_output_dataset_collection("output_hdca", output_hdca)
+    sa_session.add_all([center_hdca, input_hda1, input_hda2, input_hdca, output_hdca, input_job, output_job])
+    sa_session.flush()
+    expected_graph = {
+        "inputs": [
+            {"src": "HistoryDatasetAssociation", "id": input_hda1.id},
+            {"src": "HistoryDatasetAssociation", "id": input_hda2.id},
+            {"src": "HistoryDatasetCollectionAssociation", "id": input_hdca.id},
+        ],
+        "outputs": [
+            {"src": "HistoryDatasetAssociation", "id": output_hda.id},
+            {"src": "HistoryDatasetCollectionAssociation", "id": output_hdca.id},
+        ],
+    }
+    return center_hdca, expected_graph
+
+
+# =============================================================================
+def test_graph_manager_inputs_for_hda(job_connections_manager: JobConnectionsManager):
+    sa_session = job_connections_manager.sa_session
+    center_hda, expected_graph = setup_connected_dataset(sa_session)
+    s = job_connections_manager.inputs_for_hda(center_hda.id)
+    assert len(sa_session.execute(union(*s)).all()) == 2
+
+
+def test_graph_manager_outputs_for_hda(job_connections_manager: JobConnectionsManager):
+    sa_session = job_connections_manager.sa_session
+    center_hda, expected_graph = setup_connected_dataset(sa_session)
+    s = job_connections_manager.outputs_derived_from_input_hda(center_hda.id)
+    assert len(sa_session.execute(union(*s)).all()) == 2
+
+
+def test_graph_manager_inputs_for_hdca(job_connections_manager: JobConnectionsManager):
+    sa_session = job_connections_manager.sa_session
+    center_hdca, expected_graph = setup_connected_dataset_collection(sa_session)
+    s = job_connections_manager.inputs_for_hdca(center_hdca.id)
+    assert len(sa_session.execute(union(*s)).all()) == 3
+
+
+def test_graph_manager_outputs_for_hdca(job_connections_manager: JobConnectionsManager):
+    sa_session = job_connections_manager.sa_session
+    center_hdca, expected_graph = setup_connected_dataset_collection(sa_session)
+    s = job_connections_manager.outputs_derived_from_input_hdca(center_hdca.id)
+    assert len(sa_session.execute(union(*s)).all()) == 2
+
+
+def test_graph_manager_hda(job_connections_manager: JobConnectionsManager):
+    center_hda, expected_graph = setup_connected_dataset(job_connections_manager.sa_session)
+    assert job_connections_manager.get_connections_graph(center_hda.id, "HistoryDatasetAssociation") == expected_graph
+
+
+def test_graph_manager_hdca(job_connections_manager: JobConnectionsManager):
+    center_hdca, expected_graph = setup_connected_dataset_collection(job_connections_manager.sa_session)
+    assert (
+        job_connections_manager.get_connections_graph(center_hdca.id, "HistoryDatasetCollectionAssociation")
+        == expected_graph
+    )
diff --git a/test/unit/app/test_dbscript.py b/test/unit/app/test_dbscript.py
index e8af5abf6a1..41e38692dcd 100644
--- a/test/unit/app/test_dbscript.py
+++ b/test/unit/app/test_dbscript.py
@@ -59,7 +59,7 @@ def alembic_env_dir(migrations_dir) -> str:
 def alembic_config_text(migrations_dir) -> List[str]:
     """Contents of production alembic.ini as list of lines"""
     current_config_path = migrations_dir / "alembic.ini"
-    with open(current_config_path, "r") as f:
+    with open(current_config_path) as f:
         return f.readlines()
 
 
diff --git a/test/unit/data/datatypes/test_cram.py b/test/unit/data/datatypes/test_cram.py
index a2908d9b45b..bf40c1b5a82 100644
--- a/test/unit/data/datatypes/test_cram.py
+++ b/test/unit/data/datatypes/test_cram.py
@@ -1,5 +1,3 @@
-import os
-
 import pysam
 
 from galaxy.datatypes.binary import CRAM
@@ -12,9 +10,7 @@ from .util import (
 def test_cram():
     c = CRAM()
     with get_input_files("2.cram") as input_files, get_dataset(input_files[0], index_attr="cram_index") as dataset:
-        assert os.path.exists(dataset.metadata.cram_index.file_name) is False
-        c.set_index_file(dataset=dataset, index_file=dataset.metadata.cram_index)
-        assert os.path.exists(dataset.metadata.cram_index.file_name) is True
+        assert c.set_index_file(dataset=dataset, index_file=dataset.metadata.cram_index) is True
         c.set_meta(dataset)
         pysam.AlignmentFile(dataset.file_name, index_filename=dataset.metadata.cram_index.file_name)
     assert dataset.metadata.cram_version == "3.0"
diff --git a/test/unit/data/datatypes/test_tabular.py b/test/unit/data/datatypes/test_tabular.py
index a41d8333e31..a66e89d5792 100644
--- a/test/unit/data/datatypes/test_tabular.py
+++ b/test/unit/data/datatypes/test_tabular.py
@@ -14,4 +14,4 @@ def test_tabular_set_meta_large_file():
         test_file.flush()
         dataset = MockDataset(id=1)
         dataset.file_name = test_file.name
-        Tabular().set_meta(dataset)
+        Tabular().set_meta(dataset)  # type: ignore [arg-type]
diff --git a/test/unit/data/datatypes/test_validation.py b/test/unit/data/datatypes/test_validation.py
index 6640e7c1991..311867740ab 100644
--- a/test/unit/data/datatypes/test_validation.py
+++ b/test/unit/data/datatypes/test_validation.py
@@ -51,7 +51,7 @@ def _assert_valid(extension, file_name):
 
 def _run_validation(extension, file_name):
     datatype = datatypes_registry.datatypes_by_extension[extension]
-    validation = validate(MockDataset(get_test_fname(file_name), datatype))
+    validation = validate(MockDataset(get_test_fname(file_name), datatype))  # type: ignore[arg-type]
     return validation
 
 
diff --git a/test/unit/data/datatypes/util.py b/test/unit/data/datatypes/util.py
index b77b2513541..5defbc5aaac 100644
--- a/test/unit/data/datatypes/util.py
+++ b/test/unit/data/datatypes/util.py
@@ -36,7 +36,7 @@ class MockDataset:
 @contextmanager
 def get_dataset(filename, index_attr="bam_index", dataset_id=1, has_data=True):
     dataset = MockDataset(dataset_id)
-    with get_input_files(filename) as input_files, get_tmp_path() as index_path:
+    with get_input_files(filename) as input_files, get_tmp_path(should_exist=True) as index_path:
         dataset.file_name = input_files[0]
         index = MockMetadata()
         index.file_name = index_path
@@ -64,6 +64,6 @@ def get_input_files(*args):
         yield test_files
         new_md5_sums = [md5_hash_file(f) for f in test_files]
         for old_hash, new_hash, f in zip(md5_sums, new_md5_sums, test_files):
-            assert old_hash == new_hash, "Unexpected change of content for file %s" % f
+            assert old_hash == new_hash, f"Unexpected change of content for file {f}"
     finally:
         shutil.rmtree(temp_dir, ignore_errors=True)
diff --git a/test/unit/data/model/test_model.py b/test/unit/data/model/test_model.py
index c5326c6e204..692578533dc 100644
--- a/test/unit/data/model/test_model.py
+++ b/test/unit/data/model/test_model.py
@@ -13,3 +13,8 @@ def test_get_uuid():
 
     rval = model.get_uuid()
     assert isinstance(rval, UUID)
+
+
+def test_permitted_actions():
+    actions = model.Dataset.permitted_actions
+    assert actions and len(actions.values()) == 2
diff --git a/test/unit/data/model/test_model_store.py b/test/unit/data/model/test_model_store.py
index 99850c481eb..1238464438a 100644
--- a/test/unit/data/model/test_model_store.py
+++ b/test/unit/data/model/test_model_store.py
@@ -341,12 +341,17 @@ def validate_crate_metadata(as_dict):
 
 
 def validate_has_pl_galaxy(ro_crate: ROCrate):
-    found = False
-    for e in ro_crate.get_entities():
-        if e.id == "https://w3id.org/workflowhub/workflow-ro-crate#galaxy":
-            found = True
-            assert e.url == "https://galaxyproject.org/"
-    assert found
+    programming_language = ro_crate.mainEntity.get("programmingLanguage")
+    assert programming_language
+    assert programming_language.id == "https://w3id.org/workflowhub/workflow-ro-crate#galaxy"
+    assert programming_language.name == "Galaxy"
+    assert programming_language.url == "https://galaxyproject.org/"
+    assert programming_language.version
+
+
+def validate_organize_action(ro_crate: ROCrate):
+    organize_action = next((x for x in ro_crate.contextual_entities if x.type == "OrganizeAction"), None)
+    assert organize_action
 
 
 def validate_has_mit_license(ro_crate: ROCrate):
@@ -383,12 +388,86 @@ def validate_history_crate_directory(crate_directory):
     validate_has_readme(crate)
 
 
+def validate_main_entity(ro_crate: ROCrate):
+    workflow = ro_crate.mainEntity
+    assert workflow
+    assert workflow.id.endswith(".gxwf.yml")
+    assert workflow["name"]
+    assert workflow["name"] == "Test Workflow"
+    assert "SoftwareSourceCode" in workflow.type
+    assert "ComputationalWorkflow" in workflow.type
+    assert len(workflow["input"]) == 2
+    assert len(workflow["output"]) == 1
+
+
+def validate_create_action(ro_crate: ROCrate):
+    workflow = ro_crate.mainEntity
+    actions = [_ for _ in ro_crate.contextual_entities if "CreateAction" in _.type]
+    assert len(actions) == 1
+    wf_action = actions[0]
+    assert wf_action["instrument"]
+    assert wf_action["instrument"] is workflow
+    wf_objects = wf_action["object"]
+    wf_results = wf_action["result"]
+    assert len(wf_objects) == 2
+    assert len(wf_results) == 1
+    for entity in wf_results:
+        if entity.id.endswith(".txt"):
+            assert "File" in entity.type
+            wf_output_file = entity
+            assert wf_output_file["encodingFormat"] == "text/plain"
+            assert wf_output_file["exampleOfWork"] is workflow["output"][0]
+
+
+def validate_other_entities(ro_crate: ROCrate):
+    workflow = ro_crate.mainEntity
+    inputs = workflow["input"]
+    outputs = workflow["output"]
+    assert inputs[0]["additionalType"] == "File"
+    assert inputs[1]["additionalType"] == "None"
+    assert outputs[0]["additionalType"] == "File"
+
+    for entity in inputs + outputs:
+        assert "FormalParameter" in entity.type
+
+    sel = [_ for _ in ro_crate.contextual_entities if "OrganizeAction" in _.type]
+    assert len(sel) == 1
+    engine_action = sel[0]
+    assert "SoftwareApplication" in engine_action["instrument"].type
+
+
 def validate_invocation_crate_directory(crate_directory):
     crate = open_ro_crate(crate_directory)
+    for e in crate.contextual_entities:
+        print(e.type)
+    validate_main_entity(crate)
+    validate_create_action(crate)
+    validate_other_entities(crate)
     validate_has_pl_galaxy(crate)
+    validate_organize_action(crate)
     validate_has_mit_license(crate)
-    validate_has_readme(crate)
-    # print(json.dumps(metadata_json, indent=4))
+    # validate_has_readme(crate)
+
+
+def validate_invocation_collection_crate_directory(crate_directory):
+    ro_crate = open_ro_crate(crate_directory)
+    workflow = ro_crate.mainEntity
+    root = ro_crate.root_dataset
+    actions = [_ for _ in ro_crate.contextual_entities if "CreateAction" in _.type]
+    assert len(actions) == 1
+    wf_action = actions[0]
+    wf_objects = wf_action["object"]
+    assert len(workflow["input"]) == 3
+    assert len(workflow["output"]) == 1
+    assert len(root["mentions"]) == 3
+    collections = [_ for _ in ro_crate.contextual_entities if "Collection" in _.type]
+    assert len(collections) == 3
+    collection = collections[0]
+    assert collection.type == "Collection"
+    assert collection["additionalType"] == "list"
+    assert len(collection["hasPart"]) == 2
+    for dataset in collection["hasPart"]:
+        assert dataset in wf_objects
 
 
 def test_export_history_to_ro_crate(tmp_path):
@@ -404,19 +483,27 @@ def test_export_history_to_ro_crate(tmp_path):
 def test_export_invocation_to_ro_crate(tmp_path):
     app = _mock_app()
     workflow_invocation = _setup_invocation(app)
-
     crate_directory = tmp_path / "crate"
     with store.ROCrateModelExportStore(crate_directory, app=app) as export_store:
         export_store.export_workflow_invocation(workflow_invocation)
     validate_invocation_crate_directory(crate_directory)
 
 
+def test_export_collection_invocation_to_ro_crate(tmp_path):
+    app = _mock_app()
+    workflow_invocation = _setup_collection_invocation(app)
+    crate_directory = tmp_path / "crate"
+    with store.ROCrateModelExportStore(crate_directory, app=app) as export_store:
+        export_store.export_workflow_invocation(workflow_invocation)
+    validate_invocation_collection_crate_directory(crate_directory)
+
+
 def test_export_invocation_to_ro_crate_archive(tmp_path):
     app = _mock_app()
     workflow_invocation = _setup_invocation(app)
 
     crate_zip = tmp_path / "crate.zip"
-    with store.ROCrateArchiveModelExportStore(crate_zip, app=app) as export_store:
+    with store.ROCrateArchiveModelExportStore(crate_zip, app=app, export_files="symlink") as export_store:
         export_store.export_workflow_invocation(workflow_invocation)
     compressed_file = CompressedFile(crate_zip)
     assert compressed_file.file_type == "zip"
@@ -750,18 +837,27 @@ def _setup_invocation(app):
     sa_session = app.model.context
 
     u, h, d1, d2, j = _setup_simple_cat_job(app)
+    j.parameters = [model.JobParameter(name="index_path", value='"/old/path/human"')]
 
     workflow_step_1 = model.WorkflowStep()
     workflow_step_1.order_index = 0
     workflow_step_1.type = "data_input"
+    workflow_step_1.tool_inputs = {}
     sa_session.add(workflow_step_1)
     workflow_1 = _workflow_from_steps(u, [workflow_step_1])
     workflow_1.license = "MIT"
+    workflow_1.name = "Test Workflow"
     sa_session.add(workflow_1)
     workflow_invocation = _invocation_for_workflow(u, workflow_1)
     invocation_step = model.WorkflowInvocationStep()
     invocation_step.workflow_step = workflow_step_1
+    invocation_step.job = j
     sa_session.add(invocation_step)
+    input_assoc = model.WorkflowRequestToInputDatasetAssociation()
+    input_assoc.workflow_invocation = workflow_invocation
+    input_assoc.workflow_step = workflow_step_1
+    input_assoc.dataset = d1
+    invocation_step.input_datasets = [input_assoc]
     output_assoc = model.WorkflowInvocationStepOutputDatasetAssociation()
     output_assoc.dataset = d2
     invocation_step.output_datasets = [output_assoc]
@@ -772,6 +868,91 @@ def _setup_invocation(app):
     return workflow_invocation
 
 
+def _setup_simple_collection_job(app, state="ok"):
+    sa_session = app.model.context
+
+    u = model.User(email="collection@example.com", password="password")
+    h = model.History(name="Test History", user=u)
+
+    d1, d2, d3, d4 = _create_datasets(sa_session, h, 4)
+
+    c1 = model.DatasetCollection(collection_type="list")
+    hc1 = model.HistoryDatasetCollectionAssociation(history=h, hid=1, collection=c1, name="HistoryCollectionTest1")
+    dce1 = model.DatasetCollectionElement(collection=c1, element=d1, element_identifier="forward", element_index=0)
+    dce2 = model.DatasetCollectionElement(collection=c1, element=d2, element_identifier="reverse", element_index=1)
+
+    c2 = model.DatasetCollection(collection_type="list")
+    hc2 = model.HistoryDatasetCollectionAssociation(history=h, hid=2, collection=c2, name="HistoryCollectionTest2")
+    dce3 = model.DatasetCollectionElement(collection=c2, element=d1, element_identifier="forward", element_index=0)
+    dce4 = model.DatasetCollectionElement(collection=c2, element=d3, element_identifier="reverse", element_index=1)
+
+    c3 = model.DatasetCollection(collection_type="list")
+    hc3 = model.HistoryDatasetCollectionAssociation(history=h, hid=3, collection=c3, name="HistoryCollectionTest3")
+    dce5 = model.DatasetCollectionElement(collection=c3, element=d4, element_identifier="out", element_index=0)
+
+    j = model.Job()
+    j.user = h.user
+    j.tool_id = "cat1"
+    j.add_input_dataset("input1", d1)
+    j.add_input_dataset("input2", d2)
+    j.add_input_dataset("input3", d3)
+    j.add_output_dataset("out_file1", d4)
+    j.add_input_dataset_collection("input1_collect", hc1)
+    j.add_input_dataset_collection("input2_collect", hc2)
+    j.add_output_dataset_collection("output", hc3)
+
+    sa_session.add(dce1)
+    sa_session.add(dce2)
+    sa_session.add(dce3)
+    sa_session.add(dce4)
+    sa_session.add(dce5)
+    sa_session.add(hc1)
+    sa_session.add(hc2)
+    sa_session.add(hc3)
+    sa_session.add(j)
+    sa_session.flush()
+
+    return u, h, c1, c2, c3, hc1, hc2, hc3, j
+
+
+def _setup_collection_invocation(app):
+    sa_session = app.model.context
+
+    u, h, c1, c2, c3, hc1, hc2, hc3, j = _setup_simple_collection_job(app)
+
+    workflow_step_1 = model.WorkflowStep()
+    workflow_step_1.order_index = 0
+    workflow_step_1.type = "data_collection_input"
+    workflow_step_1.tool_inputs = {}
+    sa_session.add(workflow_step_1)
+    workflow_1 = _workflow_from_steps(u, [workflow_step_1])
+    workflow_1.license = "MIT"
+    workflow_1.name = "Test Workflow"
+    sa_session.add(workflow_1)
+    workflow_invocation = _invocation_for_workflow(u, workflow_1)
+    invocation_step = model.WorkflowInvocationStep()
+    invocation_step.workflow_step = workflow_step_1
+    invocation_step.job = j
+    sa_session.add(invocation_step)
+    input_assoc = model.WorkflowRequestToInputDatasetCollectionAssociation()
+    input_assoc.workflow_invocation = workflow_invocation
+    input_assoc.workflow_step = workflow_step_1
+    input_assoc.dataset_collection = hc1
+    input_assoc1 = model.WorkflowRequestToInputDatasetCollectionAssociation()
+    input_assoc1.workflow_invocation = workflow_invocation
+    input_assoc1.workflow_step = workflow_step_1
+    input_assoc1.dataset_collection = hc2
+    invocation_step.input_dataset_collections = [input_assoc, input_assoc1]
+    output_assoc = model.WorkflowInvocationStepOutputDatasetCollectionAssociation()
+    output_assoc.dataset_collection = hc3
+    invocation_step.output_dataset_collections = [output_assoc]
+    workflow_invocation.steps = [invocation_step]
+    workflow_invocation.user = u
+    sa_session.add(workflow_invocation)
+    sa_session.flush()
+    return workflow_invocation
+
+
 def _import_export_history(app, h, dest_export=None, export_files=None, import_options=None, include_hidden=False):
     if dest_export is None:
         dest_parent = mkdtemp()
diff --git a/test/unit/data/test_galaxy_mapping.py b/test/unit/data/test_galaxy_mapping.py
index 9016251964e..8ea27b19b04 100644
--- a/test/unit/data/test_galaxy_mapping.py
+++ b/test/unit/data/test_galaxy_mapping.py
@@ -239,7 +239,7 @@ class TestMappings(BaseModelTestCase):
         for i in range(elements):
             assert c1[i] == dces[i]
 
-    def test_dataset_instance_order(self):
+    def test_dataset_instance_order(self) -> None:
         u = model.User(email="mary@example.com", password="password")
         h1 = model.History(name="History 1", user=u)
         elements = []
diff --git a/test/unit/tool_util/data/__init__.py b/test/unit/tool_util/data/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/test/unit/tool_util/test_tool_data.py b/test/unit/tool_util/data/conftest.py
similarity index 57%
rename from test/unit/tool_util/test_tool_data.py
rename to test/unit/tool_util/data/conftest.py
index 0855b18db36..52ed8cf66e9 100644
--- a/test/unit/tool_util/test_tool_data.py
+++ b/test/unit/tool_util/data/conftest.py
@@ -8,13 +8,6 @@ data2	data2name	${__HERE__}/data2/entry.txt
 """
 
 
-LOC_ALPHA_CONTENTS_V2 = """
-data1	data1name	${__HERE__}/data1/entry.txt
-data2	data2name	${__HERE__}/data2/entry.txt
-data3	data3name	${__HERE__}/data3/entry.txt
-"""
-
-
 LOC_BETA_CONTENTS_1 = """
 beta1	beta1name	${__HERE__}/beta1/entry.txt
 """
@@ -104,60 +97,3 @@ def _write_loc_files(tmp_path):
     beta2.mkdir()
     beta2_entry = beta2 / "entry.txt"
     beta2_entry.write_text("This is beta 2.")
-
-
-def test_data_tables_as_dictionary(tdt_manager):
-    assert "testalpha" in tdt_manager.data_tables
-    assert "testdelta" not in tdt_manager.data_tables
-
-
-def test_to_dict(tdt_manager):
-    as_dict = tdt_manager.to_dict()
-    assert "testalpha" in as_dict
-    assert "testdelta" not in as_dict
-    testalpha_as_dict = as_dict["testalpha"]
-    assert "columns" in testalpha_as_dict
-
-
-def test_index(tdt_manager):
-    index = tdt_manager.index()
-    assert len(index.__root__) >= 1
-    entry = index.find_entry("testalpha")
-    assert entry
-    entry = index.find_entry("testomega")
-    assert not entry
-
-
-def test_reload(tdt_manager, tmp_path):
-    assert len(tdt_manager["testalpha"].data) == 2
-    loc1 = tmp_path / "testalpha.loc"
-    loc1.write_text(LOC_ALPHA_CONTENTS_V2)
-    tdt_manager.reload_tables()
-    assert len(tdt_manager["testalpha"].data) == 3
-
-
-def test_reload_by_path(tdt_manager, tmp_path):
-    assert len(tdt_manager["testalpha"].data) == 2
-    loc1 = tmp_path / "testalpha.loc"
-    loc1.write_text(LOC_ALPHA_CONTENTS_V2)
-    tdt_manager.reload_tables(path=str(loc1))
-    assert len(tdt_manager["testalpha"].data) == 3
-
-
-def test_reload_by_name(tdt_manager, tmp_path):
-    assert len(tdt_manager["testalpha"].data) == 2
-    loc1 = tmp_path / "testalpha.loc"
-    loc1.write_text(LOC_ALPHA_CONTENTS_V2)
-    tdt_manager.reload_tables("testalpha")
-    assert len(tdt_manager["testalpha"].data) == 3
-
-
-def test_merging_tables(merged_tdt_manager):
-    assert len(merged_tdt_manager["testbeta"].data) == 2
-
-
-def test_to_json(merged_tdt_manager, tmp_path):
-    json_path = tmp_path / "as_json.json"
-    assert not json_path.exists()
-    merged_tdt_manager.to_json(json_path)
-    assert json_path.exists()
diff --git a/test/unit/tool_util/data/example_data_managers/manual.xml b/test/unit/tool_util/data/example_data_managers/manual.xml
new file mode 100644
index 00000000000..4abe2cf71c5
--- /dev/null
+++ b/test/unit/tool_util/data/example_data_managers/manual.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<data_managers>
+    <data_manager tool_file="data_manager/data_manager_manual.xml" id="data_manager_manual" version="0.0.1" undeclared_tables="True" />
+</data_managers>
diff --git a/test/unit/tool_util/data/example_data_managers/mothur.xml b/test/unit/tool_util/data/example_data_managers/mothur.xml
new file mode 100644
index 00000000000..86745877ace
--- /dev/null
+++ b/test/unit/tool_util/data/example_data_managers/mothur.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<data_managers>
+  <data_manager tool_file="data_manager/data_manager_fetch_mothur_reference_data.xml" id="data_manager_mothur_fetch_reference_data">
+    <data_table name="mothur_aligndb">
+      <output>
+        <column name="name" />
+        <column name="value" output_ref="out_file" >
+          <move type="file">
+            <source>${value}</source>
+            <target base="${GALAXY_DATA_MANAGER_DATA_PATH}">mothur/aligndb/${value}</target>
+          </move>
+          <value_translation>${GALAXY_DATA_MANAGER_DATA_PATH}/mothur/aligndb/${value}</value_translation>
+          <value_translation type="function">abspath</value_translation>
+        </column>
+      </output>
+    </data_table>
+    <data_table name="mothur_lookup">
+      <output>
+        <column name="name" />
+        <column name="value" output_ref="out_file" >
+          <move type="file">
+            <source>${value}</source>
+            <target base="${GALAXY_DATA_MANAGER_DATA_PATH}">mothur/lookup/${value}</target>
+          </move>
+          <value_translation>${GALAXY_DATA_MANAGER_DATA_PATH}/mothur/lookup/${value}</value_translation>
+          <value_translation type="function">abspath</value_translation>
+        </column>
+      </output>
+    </data_table>
+    <data_table name="mothur_map">
+      <output>
+        <column name="name" />
+        <column name="value" output_ref="out_file" >
+          <move type="file">
+            <source>${value}</source>
+            <target base="${GALAXY_DATA_MANAGER_DATA_PATH}">mothur/map/${value}</target>
+          </move>
+          <value_translation>${GALAXY_DATA_MANAGER_DATA_PATH}/mothur/map/${value}</value_translation>
+          <value_translation type="function">abspath</value_translation>
+        </column>
+      </output>
+    </data_table>
+    <data_table name="mothur_taxonomy">
+      <output>
+        <column name="name" />
+        <column name="value" output_ref="out_file" >
+          <move type="file">
+            <source>${value}</source>
+            <target base="${GALAXY_DATA_MANAGER_DATA_PATH}">mothur/taxonomy/${value}</target>
+          </move>
+          <value_translation>${GALAXY_DATA_MANAGER_DATA_PATH}/mothur/taxonomy/${value}</value_translation>
+          <value_translation type="function">abspath</value_translation>
+        </column>
+      </output>
+    </data_table>
+  </data_manager>
+</data_managers>
diff --git a/test/unit/tool_util/data/test_tool_data.py b/test/unit/tool_util/data/test_tool_data.py
new file mode 100644
index 00000000000..deff586e924
--- /dev/null
+++ b/test/unit/tool_util/data/test_tool_data.py
@@ -0,0 +1,62 @@
+LOC_ALPHA_CONTENTS_V2 = """
+data1	data1name	${__HERE__}/data1/entry.txt
+data2	data2name	${__HERE__}/data2/entry.txt
+data3	data3name	${__HERE__}/data3/entry.txt
+"""
+
+
+def test_data_tables_as_dictionary(tdt_manager):
+    assert "testalpha" in tdt_manager.data_tables
+    assert "testdelta" not in tdt_manager.data_tables
+
+
+def test_to_dict(tdt_manager):
+    as_dict = tdt_manager.to_dict()
+    assert "testalpha" in as_dict
+    assert "testdelta" not in as_dict
+    testalpha_as_dict = as_dict["testalpha"]
+    assert "columns" in testalpha_as_dict
+
+
+def test_index(tdt_manager):
+    index = tdt_manager.index()
+    assert len(index.__root__) >= 1
+    entry = index.find_entry("testalpha")
+    assert entry
+    entry = index.find_entry("testomega")
+    assert not entry
+
+
+def test_reload(tdt_manager, tmp_path):
+    assert len(tdt_manager["testalpha"].data) == 2
+    loc1 = tmp_path / "testalpha.loc"
+    loc1.write_text(LOC_ALPHA_CONTENTS_V2)
+    tdt_manager.reload_tables()
+    assert len(tdt_manager["testalpha"].data) == 3
+
+
+def test_reload_by_path(tdt_manager, tmp_path):
+    assert len(tdt_manager["testalpha"].data) == 2
+    loc1 = tmp_path / "testalpha.loc"
+    loc1.write_text(LOC_ALPHA_CONTENTS_V2)
+    tdt_manager.reload_tables(path=str(loc1))
+    assert len(tdt_manager["testalpha"].data) == 3
+
+
+def test_reload_by_name(tdt_manager, tmp_path):
+    assert len(tdt_manager["testalpha"].data) == 2
+    loc1 = tmp_path / "testalpha.loc"
+    loc1.write_text(LOC_ALPHA_CONTENTS_V2)
+    tdt_manager.reload_tables("testalpha")
+    assert len(tdt_manager["testalpha"].data) == 3
+
+
+def test_merging_tables(merged_tdt_manager):
+    assert len(merged_tdt_manager["testbeta"].data) == 2
+
+
+def test_to_json(merged_tdt_manager, tmp_path):
+    json_path = tmp_path / "as_json.json"
+    assert not json_path.exists()
+    merged_tdt_manager.to_json(json_path)
+    assert json_path.exists()
diff --git a/test/unit/tool_util/data/test_tool_data_bundles.py b/test/unit/tool_util/data/test_tool_data_bundles.py
new file mode 100644
index 00000000000..a5f228b2b94
--- /dev/null
+++ b/test/unit/tool_util/data/test_tool_data_bundles.py
@@ -0,0 +1,248 @@
+import csv
+import json
+import os
+from dataclasses import dataclass
+
+from galaxy.tool_util.data import (
+    BUNDLE_INDEX_FILE_NAME,
+    BundleProcessingOptions,
+)
+from galaxy.tool_util.data.bundles.models import (
+    convert_data_tables_xml,
+    DataTableBundleProcessorDescription,
+)
+from galaxy.util import (
+    galaxy_directory,
+    parse_xml,
+)
+from galaxy.util.resources import resource_path
+
+TOOLS_DIRECTORY = os.path.abspath(os.path.join(galaxy_directory(), "test/functional/tools/"))
+
+
+def test_xml_parsing() -> None:
+    path = os.path.join(TOOLS_DIRECTORY, "sample_data_manager_conf.xml")
+    tree = parse_xml(path)
+    data_managers_el = tree.getroot()
+    data_manager_el = data_managers_el.find("data_manager")
+    description = convert_data_tables_xml(data_manager_el)
+    assert not description.undeclared_tables
+    assert len(description.data_tables) == 1
+    data_table = description.data_tables[0]
+    output = data_table.output
+    assert output
+    columns = output.columns
+    assert len(columns) == 2
+    column1 = columns[0]
+    assert column1.name == "value"
+    assert column1.output_ref is None
+    column2 = columns[1]
+    assert column2.name == "path"
+    assert column2.output_ref == "out_file"
+    moves = column2.moves
+    assert len(moves) == 1
+    move = moves[0]
+    assert move.type == "directory"
+    assert move.relativize_symlinks is True
+    assert move.target_base == "${GALAXY_DATA_MANAGER_DATA_PATH}"
+    assert move.target_value == "testbeta/${value}"
+    assert move.source_base is None
+    assert move.source_value == ""
+
+
+def test_parsing_manual() -> None:
+    path = resource_path(__package__, "example_data_managers/manual.xml")
+    tree = parse_xml(path)
+    data_managers_el = tree.getroot()
+    data_manager_el = data_managers_el.find("data_manager")
+    description = convert_data_tables_xml(data_manager_el)
+    assert description.undeclared_tables
+    assert len(description.data_tables) == 0
+
+
+def test_parsing_mothur() -> None:
+    path = resource_path(__package__, "example_data_managers/mothur.xml")
+    tree = parse_xml(path)
+    data_managers_el = tree.getroot()
+    data_manager_el = data_managers_el.find("data_manager")
+    description = convert_data_tables_xml(data_manager_el)
+    assert not description.undeclared_tables
+    assert len(description.data_tables) == 4
+
+
+@dataclass
+class OutputDataset:
+    file_name: str
+    extra_files_path: str
+    ext: str = "data_manager_json"
+
+    def extra_files_path_exists(self) -> bool:
+        return os.path.exists(self.extra_files_path)
+
+
+def prepare_typical_output_and_description(tmp_path):
+    target_path = tmp_path / "newvalue.txt"
+    target_path.write_text("Moo Cow")
+    output = {"data_tables": {"testalpha": [{"value": "newvalue", "name": "mynewname", "path": "newvalue.txt"}]}}
+    output_dataset_path = tmp_path / "output.dat"
+    output_dataset_path.write_text(json.dumps(output))
+    extra_files_path = tmp_path / "extra"
+    extra_files_path.mkdir()
+    output_dataset = OutputDataset(
+        output_dataset_path,
+        extra_files_path,
+    )
+    out_data = {"out1": output_dataset}
+    data_table = {
+        "name": "testalpha",
+        "output": {
+            "columns": [
+                {
+                    "name": "value",
+                },
+                {
+                    "name": "name",
+                },
+                {
+                    "name": "path",
+                    "data_table_name": "path",
+                    "output_ref": "out1",
+                    "moves": [
+                        {
+                            "type": "directory",
+                            "relativize_symlinks": True,
+                            "target_value": "testalpha/${value}",
+                            "target_base": "${GALAXY_DATA_MANAGER_DATA_PATH}",
+                        }
+                    ],
+                    "value_translations": [
+                        {"value": "${GALAXY_DATA_MANAGER_DATA_PATH}/testalpha/${value}/${path}", "type": "template"},
+                        {"value": "abspath", "type": "function"},
+                    ],
+                },
+            ]
+        },
+    }
+    process_description = DataTableBundleProcessorDescription(
+        **{
+            "undeclared_tables": False,
+            "data_tables": [data_table],
+        }
+    )
+    return out_data, process_description
+
+
+def test_typical_processing(tdt_manager, tmp_path):
+    options = BundleProcessingOptions(
+        what="data manager 'mock'",
+        data_manager_path=str(tmp_path),
+        target_config_file=str(tmp_path / "sample_data_managers_conf.xml"),
+    )
+    out_data, process_description = prepare_typical_output_and_description(tmp_path)
+    repo_info = None
+    tdt_manager.process_bundle(
+        out_data,
+        process_description,
+        repo_info,
+        options,
+    )
+    loc1 = tmp_path / "testalpha.loc"
+    new_row = _last_row(loc1)
+    assert new_row[0] == "newvalue"
+    assert new_row[1] == "mynewname"
+    assert new_row[2] == str(tmp_path / "testalpha" / "newvalue" / "newvalue.txt")
+
+
+def test_write_bundle(tdt_manager, tmp_path):
+    out_data, process_description = prepare_typical_output_and_description(tmp_path)
+    tdt_manager.write_bundle(
+        out_data,
+        process_description,
+        repo_info=None,
+    )
+    extra = tmp_path / "extra"
+    bundle_index_json_path = extra / BUNDLE_INDEX_FILE_NAME
+    assert bundle_index_json_path.exists()
+    with open(bundle_index_json_path) as f:
+        bundle_index = json.load(f)
+    assert "processor_description" in bundle_index
+    assert "data_tables" in bundle_index
+    assert "output_name" in bundle_index
+
+
+def test_import_bundle(tdt_manager, tmp_path):
+    out_data, process_description = prepare_typical_output_and_description(tmp_path)
+    tdt_manager.write_bundle(
+        out_data,
+        process_description,
+        None,
+    )
+
+    # Writing the bundle didn't update the loc files.
+    loc1 = tmp_path / "testalpha.loc"
+    new_row = _last_row(loc1)
+    assert new_row[0] != "newvalue"
+
+    options = BundleProcessingOptions(
+        what="data manager 'mock'",
+        data_manager_path=str(tmp_path),
+        target_config_file=str(tmp_path / "sample_data_managers_conf.xml"),
+    )
+    tdt_manager.import_bundle(
+        str(tmp_path / "extra"),
+        options,
+    )
+
+    # Importing the bundle does update the loc files though.
+    loc1 = tmp_path / "testalpha.loc"
+    new_row = _last_row(loc1)
+    assert new_row[0] == "newvalue"
+    assert new_row[1] == "mynewname"
+    assert new_row[2] == str(tmp_path / "testalpha" / "newvalue" / "newvalue.txt")
+
+
+def test_undeclared_tables(tdt_manager, tmp_path):
+    options = BundleProcessingOptions(
+        what="data manager 'mock'",
+        data_manager_path=str(tmp_path),
+        target_config_file=str(tmp_path / "sample_data_managers_conf.xml"),
+    )
+    target_path = tmp_path / "newvalue.txt"
+    target_path.write_text("Moo Cow")
+    output = {"data_tables": {"testalpha": [{"value": "newvalue", "name": "mynewname", "path": "newvalue.txt"}]}}
+    output_dataset_path = tmp_path / "output.dat"
+    import json
+
+    output_dataset_path.write_text(json.dumps(output))
+    extra_files_path = tmp_path / "extra"
+    output_dataset = OutputDataset(
+        output_dataset_path,
+        extra_files_path,
+    )
+    out_data = {"out1": output_dataset}
+    process_description = DataTableBundleProcessorDescription(
+        **{
+            "undeclared_tables": True,
+            "data_tables": [],
+        }
+    )
+    repo_info = None
+    tdt_manager.process_bundle(
+        out_data,
+        process_description,
+        repo_info,
+        options,
+    )
+    loc1 = tmp_path / "testalpha.loc"
+    new_row = _last_row(loc1)
+    assert new_row[0] == "newvalue"
+    assert new_row[1] == "mynewname"
+    assert new_row[2] == str(tmp_path / "newvalue.txt")
+
+
+def _last_row(loc_file):
+    with open(loc_file) as file:
+        rows = csv.reader(file, delimiter="\t")
+        for row in rows:
+            last_row = row
+        return last_row
diff --git a/test/unit/tool_util/mulled/test_get_tests.py b/test/unit/tool_util/mulled/test_get_tests.py
index 36d82d7788a..582d481056b 100644
--- a/test/unit/tool_util/mulled/test_get_tests.py
+++ b/test/unit/tool_util/mulled/test_get_tests.py
@@ -1,3 +1,5 @@
+from unittest import SkipTest
+
 from galaxy.tool_util.deps.mulled.get_tests import (
     deep_test_search,
     find_anaconda_versions,
@@ -76,7 +78,12 @@ def test_open_recipe_file():
 
 @external_dependency_management
 def test_get_alternative_versions():
-    versions = get_alternative_versions("recipes/bioblend", "meta.yaml")
+    try:
+        versions = get_alternative_versions("recipes/bioblend", "meta.yaml")
+    except Exception as e:
+        if "API rate limit" in str(e):
+            raise SkipTest("Hitting GitHub API rate limit")
+        raise
     assert versions == ["recipes/bioblend/0.7.0/meta.yaml"]
 
 
diff --git a/test/unit/tool_util/mulled/test_mulled_build.py b/test/unit/tool_util/mulled/test_mulled_build.py
index ce48a4b9fca..ab935ac95a7 100644
--- a/test/unit/tool_util/mulled/test_mulled_build.py
+++ b/test/unit/tool_util/mulled/test_mulled_build.py
@@ -1,3 +1,5 @@
+import os.path
+
 import pytest
 
 from galaxy.tool_util.deps.mulled.mulled_build import (
@@ -6,6 +8,7 @@ from galaxy.tool_util.deps.mulled.mulled_build import (
     CondaInDockerContext,
     DEFAULT_BASE_IMAGE,
     DEFAULT_EXTENDED_BASE_IMAGE,
+    InvolucroContext,
     mull_targets,
     target_str_to_targets,
 )
@@ -27,11 +30,20 @@ def test_base_image_for_targets(target, version, base_image):
     assert base_image_for_targets([target], conda_context) == base_image
 
 
+@pytest.mark.parametrize("use_mamba", [False, True])
 @external_dependency_management
-def test_mulled_build_files_cli(tmpdir):
+def test_mulled_build_files_cli(use_mamba, tmpdir):
     singularity_image_dir = tmpdir.mkdir("singularity image dir")
     target = build_target("zlib")
-    mull_targets([target], command="build-and-test", singularity=True, singularity_image_dir=singularity_image_dir)
+    involucro_context = InvolucroContext(involucro_bin=os.path.join(tmpdir, "involucro"))
+    mull_targets(
+        [target],
+        involucro_context=involucro_context,
+        command="build-and-test",
+        singularity=True,
+        use_mamba=use_mamba,
+        singularity_image_dir=singularity_image_dir,
+    )
     assert singularity_image_dir.join("zlib").exists()
 
 
diff --git a/test/unit/tool_util/test_parsing.py b/test/unit/tool_util/test_parsing.py
index a5d709119a4..9ef3a3a2389 100644
--- a/test/unit/tool_util/test_parsing.py
+++ b/test/unit/tool_util/test_parsing.py
@@ -31,6 +31,11 @@ TOOL_XML_1 = """
         <container type="docker">mycool/bwa</container>
         <requirement type="package" version="1.0">bwa</requirement>
         <resource type="cores_min">1</resource>
+        <resource type="cuda_version_min">10.2</resource>
+        <resource type="cuda_compute_capability">6.1</resource>
+        <resource type="gpu_memory_min">4042</resource>
+        <resource type="cuda_device_count_min">1</resource>
+        <resource type="cuda_device_count_max">2</resource>
     </requirements>
     <outputs>
         <data name="out1" format="bam" from_work_dir="out1.bam" />
@@ -125,6 +130,16 @@ requirements:
     version: 1.0.1
   - type: resource
     cores_min: 1
+  - type: resource
+    cuda_version_min: 10.2
+  - type: resource
+    cuda_compute_capability: 6.1
+  - type: resource
+    gpu_memory_min: 4042
+  - type: resource
+    cuda_device_count_min: 1
+  - type: resource
+    cuda_device_count_max: 2
 containers:
   - type: docker
     identifier: "awesome/bowtie"
@@ -311,6 +326,11 @@ class TestXmlLoader(BaseLoaderTestCase):
         assert requirements[0].type == "package"
         assert list(containers)[0].identifier == "mycool/bwa"
         assert resource_requirements[0].resource_type == "cores_min"
+        assert resource_requirements[1].resource_type == "cuda_version_min"
+        assert resource_requirements[2].resource_type == "cuda_compute_capability"
+        assert resource_requirements[3].resource_type == "gpu_memory_min"
+        assert resource_requirements[4].resource_type == "cuda_device_count_min"
+        assert resource_requirements[5].resource_type == "cuda_device_count_max"
         assert not resource_requirements[0].runtime_required
 
     def test_outputs(self):
@@ -486,8 +506,22 @@ class TestYamlLoader(BaseLoaderTestCase):
             "resolve_dependencies": False,
             "shell": "/bin/sh",
         }
-        assert len(resource_requirements) == 1
+        assert len(resource_requirements) == 6
         assert resource_requirements[0].to_dict() == {"resource_type": "cores_min", "value_or_expression": 1}
+        assert resource_requirements[1].to_dict() == {"resource_type": "cuda_version_min", "value_or_expression": 10.2}
+        assert resource_requirements[2].to_dict() == {
+            "resource_type": "cuda_compute_capability",
+            "value_or_expression": 6.1,
+        }
+        assert resource_requirements[3].to_dict() == {"resource_type": "gpu_memory_min", "value_or_expression": 4042}
+        assert resource_requirements[4].to_dict() == {
+            "resource_type": "cuda_device_count_min",
+            "value_or_expression": 1,
+        }
+        assert resource_requirements[5].to_dict() == {
+            "resource_type": "cuda_device_count_max",
+            "value_or_expression": 2,
+        }
 
     def test_outputs(self):
         outputs, output_collections = self._tool_source.parse_outputs(object())
diff --git a/test/unit/tool_util/test_tool_linters.py b/test/unit/tool_util/test_tool_linters.py
index eb2531de8cf..4c79f580d1e 100644
--- a/test/unit/tool_util/test_tool_linters.py
+++ b/test/unit/tool_util/test_tool_linters.py
@@ -749,6 +749,42 @@ TESTS_DISCOVER_OUTPUTS = """
 </tool>
 """
 
+TESTS_EXPECT_NUM_OUTPUTS_FILTER = """
+<tool>
+    <outputs>
+        <data>
+            <filter/>
+        </data>
+    </outputs>
+    <tests>
+        <test expect_failure="false">
+        </test>
+    </tests>
+</tool>
+"""
+
+TESTS_COMPARE_ATTRIB_INCOMPATIBILITY = """
+<tool>
+    <outputs>
+        <data name="data_name"/>
+        <collection name="collection_name" type="list:list"/>
+    </outputs>
+    <tests>
+        <test>
+            <output name="data_name" compare="re_match" decompress="true"/>
+            <output_collection name="collection_name">
+                <element compare="contains" sort="true" />
+            </output_collection>
+        </test>
+        <test>
+            <output name="data_name" compare="diff" lines_diff="2"/>
+            <output_collection name="collection_name">
+                <element compare="contains" lines_diff="2" />
+            </output_collection>
+        </test>
+    </tests>
+</tool>"""
+
 # tool xml for xml_order linter
 XML_ORDER = """
 <tool>
@@ -1339,12 +1375,12 @@ def test_outputs_format_input(lint_ctx):
     assert "1 outputs found." in lint_ctx.info_messages
     assert (
         "Using format='input' on data, format_source attribute is less ambiguous and should be used instead."
-        in lint_ctx.warn_messages
+        in lint_ctx.error_messages
     )
     assert len(lint_ctx.info_messages) == 1
     assert not lint_ctx.valid_messages
-    assert len(lint_ctx.warn_messages) == 1
-    assert not lint_ctx.error_messages
+    assert not lint_ctx.warn_messages
+    assert len(lint_ctx.error_messages) == 1
 
 
 def test_outputs_collection_format_source(lint_ctx):
@@ -1541,7 +1577,7 @@ def test_tests_asserts(lint_ctx):
         "Test 1: unknown attribute 'invalid_attrib_also_checked_in_nested_asserts' for 'not_has_text'"
         in lint_ctx.error_messages
     )
-    assert "Test 1: 'has_size' needs to specify 'n', 'min', or 'max'" in lint_ctx.error_messages
+    assert "Test 1: 'has_size' needs to specify 'value', 'min', or 'max'" in lint_ctx.error_messages
     assert "Test 1: 'has_n_columns' needs to specify 'n', 'min', or 'max'" in lint_ctx.error_messages
     assert "Test 1: 'has_n_lines' needs to specify 'n', 'min', or 'max'" in lint_ctx.error_messages
     assert not lint_ctx.warn_messages
@@ -1586,6 +1622,25 @@ def test_tests_discover_outputs(lint_ctx):
     assert len(lint_ctx.error_messages) == 4
 
 
+def test_tests_expect_num_outputs_filter(lint_ctx):
+    tool_source = get_xml_tool_source(TESTS_EXPECT_NUM_OUTPUTS_FILTER)
+    run_lint(lint_ctx, tests.lint_tests, tool_source)
+    assert "Test should specify 'expect_num_outputs' if outputs have filters" in lint_ctx.warn_messages
+    assert len(lint_ctx.warn_messages) == 1
+    assert len(lint_ctx.error_messages) == 0
+
+
+def test_tests_compare_attrib_incompatibility(lint_ctx):
+    tool_source = get_xml_tool_source(TESTS_COMPARE_ATTRIB_INCOMPATIBILITY)
+    run_lint(lint_ctx, tests.lint_tests, tool_source)
+    assert 'Test 1: Attribute decompress is incompatible with compare="re_match".' in lint_ctx.error_messages
+    assert 'Test 1: Attribute sort is incompatible with compare="contains".' in lint_ctx.error_messages
+    assert not lint_ctx.info_messages
+    assert len(lint_ctx.valid_messages) == 1
+    assert not lint_ctx.warn_messages
+    assert len(lint_ctx.error_messages) == 2
+
+
 def test_xml_order(lint_ctx):
     tool_source = get_xml_tool_source(XML_ORDER)
     run_lint(lint_ctx, xml_order.lint_xml_order, tool_source)
@@ -1597,6 +1652,37 @@ def test_xml_order(lint_ctx):
     assert not lint_ctx.error_messages
 
 
+DATA_MANAGER = """<tool id="test_dm" name="test dm" version="1" type="manage_data">
+    <inputs>
+        <param name="select" type="select">
+            <option value="a">a</option>
+            <option value="a">a</option>
+        </param>
+    </inputs>
+</tool>
+"""
+
+
+def test_data_manager(lint_ctx_xpath, lint_ctx):
+    """
+    test that all (not really testing 'all', but more than the general linter
+    which was the only one applied to data managers until 23.0) linters are applied
+    """
+    tool_xml = get_xml_tool_source(DATA_MANAGER)
+    tool_source = XmlToolSource(tool_xml)
+    lint_tool_source_with(lint_ctx, tool_source)
+    assert "No tests found, most tools should define test cases." in lint_ctx.warn_messages
+    assert "Tool contains no outputs section, most tools should produce outputs." in lint_ctx.warn_messages
+    assert "No help section found, consider adding a help section to your tool." in lint_ctx.warn_messages
+    assert "No citations found, consider adding citations to your tool." in lint_ctx.warn_messages
+    assert "Select parameter [select] has multiple options with the same text content" in lint_ctx.error_messages
+    assert "Select parameter [select] has multiple options with the same value" in lint_ctx.error_messages
+    assert "No command tag found, must specify a command template to execute." in lint_ctx.error_messages
+    assert lint_ctx.valid_messages
+    assert len(lint_ctx.warn_messages) == 4
+    assert len(lint_ctx.error_messages) == 3
+
+
 COMPLETE = """<tool>
     <macros>
         <import>macros.xml</import>
diff --git a/test/unit/webapps/services/test_history_contents.py b/test/unit/webapps/services/test_history_contents.py
deleted file mode 100644
index 25bb53df8cf..00000000000
--- a/test/unit/webapps/services/test_history_contents.py
+++ /dev/null
@@ -1,54 +0,0 @@
-import pytest
-
-from galaxy.webapps.galaxy.services.history_contents import HistoriesContentsService
-
-
-@pytest.fixture
-def mock_init(monkeypatch):
-    monkeypatch.setattr(HistoriesContentsService, "__init__", lambda _: None)
-
-
-class TestSetItemCounts:
-    """
-    up:         number of displayed items with hid > {hid}
-    down:       number of displayed items with hid < {hid}
-    total_up:   total number of items with hid > {hid}
-    total_down: total number of items with hid < {hid}
-    """
-
-    def test_set_item_counts_before(self, mock_init):
-        service = HistoriesContentsService()  # type: ignore
-        down = 10
-        total_up = 90
-        total_down = 100
-        counts = service._set_item_counts(matches_down=down, total_matches_up=total_up, total_matches_down=total_down)
-        self._verify_counts(counts, down=down, total_up=total_up, total_down=total_down)
-
-    def test_set_item_counts_after(self, mock_init):
-        service = HistoriesContentsService()  # type: ignore
-        up = 9
-        total_up = 90
-        total_down = 100
-        counts = service._set_item_counts(matches_up=up, total_matches_up=total_up, total_matches_down=total_down)
-        self._verify_counts(counts, up=up, total_up=total_up, total_down=total_down)
-
-    def test_set_item_counts_near(self, mock_init):
-        service = HistoriesContentsService()  # type: ignore
-        up = 9
-        down = 10
-        total_up = 90
-        total_down = 100
-        counts = service._set_item_counts(
-            matches_up=up, matches_down=down, total_matches_up=total_up, total_matches_down=total_down
-        )
-        self._verify_counts(counts, up=up, down=down, total_up=total_up, total_down=total_down)
-
-    def _verify_counts(self, counts, up=0, total_up=0, down=0, total_down=0):
-        # counts of displayed items
-        assert counts["matches"] == up + down
-        assert counts["matches_up"] == up
-        assert counts["matches_down"] == down
-        # total counts of matching items
-        assert counts["total_matches"] == total_up + total_down + 1
-        assert counts["total_matches_up"] == total_up
-        assert counts["total_matches_down"] == total_down
diff --git a/test/unit/webapps/test_routes.py b/test/unit/webapps/test_routes.py
index 36fd7143b63..699e6ed3c28 100644
--- a/test/unit/webapps/test_routes.py
+++ b/test/unit/webapps/test_routes.py
@@ -32,7 +32,6 @@ def test_galaxy_routes():
     config = request_config()
     config.host = "usegalaxy.org"
     config.protocol = "https"
-    assert_url_is(url_for("api_key_retrieval", qualified=True), "https://usegalaxy.org/api/authenticate/baseauth")
     assert_url_is(url_for("/tool_runner/biomart", qualified=True), "https://usegalaxy.org/tool_runner/biomart")
 
     # Test previously problematic tool ids with slashes.
diff --git a/test/unit/webapps/test_webapp_base.py b/test/unit/webapps/test_webapp_base.py
index d0aa4a42f22..1fd4ef9c3f3 100644
--- a/test/unit/webapps/test_webapp_base.py
+++ b/test/unit/webapps/test_webapp_base.py
@@ -48,7 +48,7 @@ class TestGalaxyWebTransactionHeaders:
         assert headers.get("access-control-allow-origin", None) == should_be
 
     def assert_cors_header_missing(self, headers):
-        assert not ("access-control-allow-origin" in headers)
+        assert "access-control-allow-origin" not in headers
 
     def test_parse_allowed_origin_hostnames(self) -> None:
         """Should return a list of (possibly) mixed strings and regexps"""
diff --git a/test/unit/workflows/test_modules.py b/test/unit/workflows/test_modules.py
index 02a84de3621..ba5434d875b 100644
--- a/test/unit/workflows/test_modules.py
+++ b/test/unit/workflows/test_modules.py
@@ -257,7 +257,7 @@ class MapOverTestCase(NamedTuple):
     steps: Dict[int, Any]
 
 
-def _construct_steps_for_map_over():
+def _construct_steps_for_map_over() -> List[MapOverTestCase]:
     test_case = MapOverTestCase
     # these are the cartesian product of
     # data_input = ['dataset', 'list', 'list:pair', 'list:list']
diff --git a/test/unit/workflows/test_refactor_models.py b/test/unit/workflows/test_refactor_models.py
index cae3db742c9..e91b04feb2b 100644
--- a/test/unit/workflows/test_refactor_models.py
+++ b/test/unit/workflows/test_refactor_models.py
@@ -1,6 +1,17 @@
 from galaxy.workflow.refactor.schema import (
+    AddInputAction,
+    AddStepAction,
+    ConnectAction,
+    DisconnectAction,
+    ExtractInputAction,
+    ExtractUntypedParameter,
+    InputReferenceByLabel,
+    InputReferenceByOrderIndex,
     RefactorActionExecution,
     RefactorActions,
+    StepReferenceByLabel,
+    StepReferenceByOrderIndex,
+    UpdateStepLabelAction,
 )
 
 
@@ -27,41 +38,75 @@ def test_root_list():
     actions = ar.actions
 
     a0 = actions[0]
+    assert a0.action_type == "add_step"
+    assert isinstance(a0, AddStepAction)
+    assert a0.tool_state
     assert a0.tool_state["a"] == 6
     assert a0.label == "foobar"
 
     a1 = actions[1]
+    assert a1.action_type == "update_step_label"
+    assert isinstance(a1, UpdateStepLabelAction)
+    assert isinstance(a1.step, StepReferenceByOrderIndex)
     assert a1.step.order_index == 5
+
     a2 = actions[2]
+    assert isinstance(a2, UpdateStepLabelAction)
+    assert isinstance(a2.step, StepReferenceByLabel)
     assert a2.step.label == "cool_label"
 
     a3 = actions[3]
+    assert a3.action_type == "connect"
+    assert isinstance(a3, ConnectAction)
     # Verify it sets default output_name
     assert a3.output.output_name == "output"
     assert a3.input.input_name == "foobar"
 
     a4 = actions[4]
+    assert isinstance(a4, DisconnectAction)
     assert a4.output.output_name == "o_name"
+    assert isinstance(a4.input, InputReferenceByLabel)
     assert a4.input.input_name == "foobar2"
     assert a4.input.label == "foolabel"
 
     a5 = actions[5]
+    assert isinstance(
+        a5,
+        AddInputAction,
+    )
     assert a5.type == "data"
     assert a5.optional is False
 
     a6 = actions[6]
+    assert isinstance(
+        a6,
+        AddInputAction,
+    )
     assert a6.optional is True
     assert a6.default == 5
 
     a7 = actions[7]
+    assert isinstance(
+        a7,
+        ExtractInputAction,
+    )
+    assert isinstance(a7.input, InputReferenceByOrderIndex)
     assert a7.input.order_index == 5
     assert a7.input.input_name == "foobar"
 
     a8 = actions[8]
+    assert isinstance(
+        a8,
+        ExtractUntypedParameter,
+    )
     assert a8.name == "foo"
     assert a8.label is None
 
     a9 = actions[9]
+    assert isinstance(
+        a9,
+        ExtractUntypedParameter,
+    )
     assert a9.name == "foo"
     assert a9.label == "new_foo"
 
diff --git a/test/unit/workflows/test_trs_proxy.py b/test/unit/workflows/test_trs_proxy.py
index 844b8599ef1..6296dea9968 100644
--- a/test/unit/workflows/test_trs_proxy.py
+++ b/test/unit/workflows/test_trs_proxy.py
@@ -19,50 +19,141 @@ search_test = pytest.mark.skipif(
 
 def test_proxy():
     proxy = TrsProxy()
+    server = proxy.get_server("dockstore")
 
     assert "dockstore" == proxy.get_servers()[0]["id"]
 
+    assert proxy.get_servers()[0]["api_url"] == server._trs_url
+
     tool_id = "#workflow/github.com/jmchilton/galaxy-workflow-dockstore-example-1/mycoolworkflow"
-    tool = proxy.get_tool("dockstore", tool_id)
+    tool = server.get_tool(tool_id)
     assert "description" in tool
 
     b64_tool_id = base64.b64encode(tool_id.encode("UTF-8"))
-    tool = proxy.get_tool("dockstore", b64_tool_id, tool_id_b64_encoded=True)
+    tool = server.get_tool(b64_tool_id, tool_id_b64_encoded=True)
     assert "description" in tool
 
-    versions = proxy.get_versions("dockstore", tool_id)
+    versions = server.get_versions(tool_id)
     assert isinstance(versions, list)
     assert len(versions) >= 1
 
     version_id = versions[0]["name"]
-    version = proxy.get_version("dockstore", tool_id, version_id)
+    version = server.get_version(tool_id, version_id)
     assert "descriptor_type" in version
     assert GA4GH_GALAXY_DESCRIPTOR in version["descriptor_type"]
 
-    descriptor = proxy.get_version_descriptor("dockstore", tool_id, version_id)
+    descriptor = server.get_version_descriptor(tool_id, version_id)
     content = yaml.safe_load(descriptor)
     assert "inputs" in content
 
 
+def test_match_url():
+    proxy = TrsProxy()
+    valid_dockstore = proxy.match_url(
+        "https://dockstore.org/api/ga4gh/trs/v2/tools/"
+        "quay.io%2Fcollaboratory%2Fdockstore-tool-bedtools-genomecov/versions/0.3"
+    )
+    assert valid_dockstore
+    assert valid_dockstore["trs_base_url"] == "https://dockstore.org/api"
+    # Should unquote
+    assert valid_dockstore["tool_id"] == "quay.io/collaboratory/dockstore-tool-bedtools-genomecov"
+    assert valid_dockstore["version_id"] == "0.3"
+
+    valid_dockstore_unescaped = proxy.match_url(
+        "https://dockstore.org/api/ga4gh/trs/v2/tools/"
+        "#workflow/github.com/jmchilton/galaxy-workflow-dockstore-example-1/mycoolworkflow/versions/master"
+    )
+    assert valid_dockstore_unescaped
+    assert valid_dockstore_unescaped["trs_base_url"] == "https://dockstore.org/api"
+    assert (
+        valid_dockstore_unescaped["tool_id"]
+        == "#workflow/github.com/jmchilton/galaxy-workflow-dockstore-example-1/mycoolworkflow"
+    )
+    assert valid_dockstore_unescaped["version_id"] == "master"
+
+    valid_workflow_hub = proxy.match_url("https://workflowhub.eu/ga4gh/trs/v2/tools/344/versions/1")
+    assert valid_workflow_hub
+    assert valid_workflow_hub["trs_base_url"] == "https://workflowhub.eu"
+    assert valid_workflow_hub["tool_id"] == "344"
+    assert valid_workflow_hub["version_id"] == "1"
+
+    valid_arbitrary_trs = proxy.match_url(
+        "https://my-trs-server.golf/stuff/ga4gh/trs/v2/tools/hello-world/versions/version-1"
+    )
+    assert valid_arbitrary_trs
+    assert valid_arbitrary_trs["trs_base_url"] == "https://my-trs-server.golf/stuff"
+    assert valid_arbitrary_trs["tool_id"] == "hello-world"
+    assert valid_arbitrary_trs["version_id"] == "version-1"
+
+    ignore_extra = proxy.match_url(
+        "https://workflowhub.eu/ga4gh/trs/v2/tools/344/versions/1/CWL/descriptor/ro-crate-metadata.json"
+    )
+    assert ignore_extra
+    assert ignore_extra["trs_base_url"] == "https://workflowhub.eu"
+    assert ignore_extra["tool_id"] == "344"
+    assert ignore_extra["version_id"] == "1"
+
+    invalid = proxy.match_url("https://workflowhub.eu/workflows/1")
+    assert invalid is None
+
+    missing_version = proxy.match_url("https://workflowhub.eu/ga4gh/trs/v2/tools/344")
+    assert missing_version is None
+
+    blank = proxy.match_url("")
+    assert blank is None
+
+    not_url = proxy.match_url("1234")
+    assert not_url is None
+
+
+def test_server_from_url():
+    proxy = TrsProxy()
+    server = proxy.server_from_url("https://workflowhub.eu")
+
+    assert "https://workflowhub.eu" == server._trs_url
+
+    tool_id = "138"
+    tool = server.get_tool(tool_id)
+    assert "description" in tool
+
+    b64_tool_id = base64.b64encode(tool_id.encode("UTF-8"))
+    tool = server.get_tool(b64_tool_id, tool_id_b64_encoded=True)
+    assert "description" in tool
+
+    versions = server.get_versions(tool_id)
+    assert isinstance(versions, list)
+    assert len(versions) >= 1
+
+    version_id = versions[0]["id"]  # Dockstore and WorkflowHub differ here! Spec is not clear
+    version = server.get_version(tool_id, version_id)
+    assert "descriptor_type" in version
+    assert GA4GH_GALAXY_DESCRIPTOR in version["descriptor_type"]
+
+    descriptor = server.get_version_descriptor(tool_id, version_id)
+    content = yaml.safe_load(descriptor)
+    assert "steps" in content
+
+
 @search_test
 def test_search():
     proxy = TrsProxy()
+    server = proxy.get_server("dockstore")
 
     search_kwd = parse_search_kwds("documentation")
-    response = proxy.get_tools("dockstore", **search_kwd)
+    response = server.get_tools(**search_kwd)
     assert len(response) == 1
 
     search_kwd = parse_search_kwds("n:example")
-    response = proxy.get_tools("dockstore", **search_kwd)
+    response = server.get_tools(**search_kwd)
     assert len(response) == 2
 
     search_kwd = parse_search_kwds("organization:jmchilton")
-    response = proxy.get_tools("dockstore", **search_kwd)
+    response = server.get_tools(**search_kwd)
     assert len(response) == 2
 
     search_kwd = parse_search_kwds("organization:jmchiltonx")
-    response = proxy.get_tools("dockstore", **search_kwd)
+    response = server.get_tools(**search_kwd)
     assert len(response) == 0
 
-    response = proxy.get_tools("dockstore", descriptorType="GALAXY")
+    response = server.get_tools(descriptorType="GALAXY")
     assert len(response) == 2
diff --git a/tool_list.py b/tool_list.py
deleted file mode 100644
index d335805d1fc..00000000000
--- a/tool_list.py
+++ /dev/null
@@ -1,85 +0,0 @@
-import os
-import sys
-
-# read tool_conf.xml to get all the tool xml file names
-onoff = 1
-tool_list = []
-tool_conf_file = os.environ.get("GALAXY_TEST_TOOL_CONF", None)
-
-if tool_conf_file is None:
-    for possible_tool_file in ["config/tool_conf.xml", "tool_conf.xml", "config/tool_conf.xml.sample"]:
-        tool_conf_file = possible_tool_file
-        if os.path.isfile(possible_tool_file):
-            break
-
-if tool_conf_file is None or not os.path.isfile(tool_conf_file):
-    sys.stderr.write(f"Tool config file not found: {tool_conf_file}\n")
-    sys.exit(1)
-
-for line in open(tool_conf_file):
-    if line.find("<!--") != -1:
-        onoff = 0
-    if line.find("file") != -1 and onoff == 1:
-        strs = line.split('"')
-        tool_list.append(strs[1])
-    if line.find("<section") != -1 and onoff == 1:
-        keys = line.strip().split('"')
-        n = 0
-        strtmp = "section::"
-        while n < len(keys):
-            if keys[n].find("id") != -1:
-                strtmp = strtmp + keys[n + 1]
-            if keys[n].find("name") != -1:
-                strtmp = strtmp + keys[n + 1] + "-"
-            n = n + 1
-        tool_list.append(strtmp.replace(" ", "_"))
-    if line.find("-->") != -1:
-        onoff = 1
-
-# read tool info from every tool xml file
-name = []
-id = []
-desc = []
-tool_infos = []
-for tool in tool_list:
-    if tool.find("section") != -1:
-        tool_info = dict()
-        tool_info["id"] = tool
-        tool_infos.append(tool_info)
-    if os.path.exists("tools/" + tool):
-        for line in open("tools/" + tool):
-            if line.find("<tool ") != -1 and line.find("id") != -1:
-                keys = line.strip().split('"')
-                tool_info = dict()
-                tool_info["desc"] = ""
-                for n in range(len(keys) - 1):
-                    if " id=" in keys[n]:
-                        tool_info["id"] = keys[n + 1].replace(" ", "_")
-                    if " name=" in keys[n]:
-                        tool_info["name"] = keys[n + 1]
-                    if " description=" in keys[n]:
-                        tool_info["desc"] = keys[n + 1]
-                tool_infos.append(tool_info)
-                break
-
-flag = 0
-if len(sys.argv) == 1:
-    for tool_info in tool_infos:
-        if tool_info["id"].find("section") != -1:
-            print(
-                "==========================================================================================================================================="
-            )
-            print("{:<45}\t{:<40}\t{}".format("id", "name", tool_info["id"]))
-            print(
-                "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
-            )
-        else:
-            print("{:<45}\t{:<40}".format(tool_info["id"], tool_info["name"]))
-else:
-    for tool_info in tool_infos:
-        if tool_info["id"].find("section") != -1:
-            flag = 0
-        elif flag == 1:
-            print(" functional.test_toolbox:TestForTool_%s" % tool_info["id"], end=" ")
-        if tool_info["id"].replace("section::", "") == sys.argv[1]:
-            flag = 1
diff --git a/tools/data_export/export_remote.py b/tools/data_export/export_remote.py
index c4d38b541d7..0ebbbda157f 100644
--- a/tools/data_export/export_remote.py
+++ b/tools/data_export/export_remote.py
@@ -8,7 +8,7 @@ from galaxy.files import ConfiguredFileSources
 
 def get_file_sources(file_sources_path):
     assert os.path.exists(file_sources_path), f"file sources path [{file_sources_path}] does not exist"
-    with open(file_sources_path, "r") as f:
+    with open(file_sources_path) as f:
         file_sources_as_dict = json.load(f)
     file_sources = ConfiguredFileSources.from_dict(file_sources_as_dict)
     return file_sources
diff --git a/tools/filters/fixedValueColumn.xml b/tools/filters/fixedValueColumn.xml
index 8d4ca005e76..f9df32bf080 100644
--- a/tools/filters/fixedValueColumn.xml
+++ b/tools/filters/fixedValueColumn.xml
@@ -18,14 +18,14 @@ perl '$__tool_directory__/fixedValueColumn.pl' '$input' '$out_file1' '$exp' $ite
     </param>
   </inputs>
   <outputs>
-    <data name="out_file1" format="input" metadata_source="input"/>
+    <data name="out_file1" format_source="input" metadata_source="input"/>
   </outputs>
   <tests>
     <test>
       <param name="exp" value="1"/>
-      <param name="input" value="1.bed"/>
+      <param name="input" value="1.bed" ftype="bed"/>
       <param name="iterate" value="no"/>
-      <output name="out_file1" file="eq-addvalue.dat"/>
+      <output name="out_file1" file="eq-addvalue.dat" ftype="bed"/>
     </test>
   </tests>
   <help>
diff --git a/tools/interactive/interactivetool_mgnify_notebook.xml b/tools/interactive/interactivetool_mgnify_notebook.xml
new file mode 100644
index 00000000000..ea26f7c25f3
--- /dev/null
+++ b/tools/interactive/interactivetool_mgnify_notebook.xml
@@ -0,0 +1,115 @@
+<tool id="interactive_tool_mgnify_notebook" tool_type="interactive" name="Interactive MGnify Notebook" version="0.0.1" profile="22.01">
+    <requirements>
+        <container type="docker">quay.io/microbiome-informatics/emg-notebooks.dev:v1.0.1</container>
+    </requirements>
+    <entry_points>
+        <entry_point name="MGnify Interactive Tool" requires_domain="True">
+            <port>8888</port>
+            <url>lab</url>
+        </entry_point>
+    </entry_points>
+    <environment_variables>
+        <environment_variable name="HISTORY_ID">$__history_id__</environment_variable>
+        <environment_variable name="REMOTE_HOST">$__galaxy_url__</environment_variable>
+        <environment_variable name="GALAXY_WEB_PORT">8080</environment_variable>
+        <environment_variable name="GALAXY_URL">$__galaxy_url__</environment_variable>
+    </environment_variables>
+    <command><![CDATA[
+        #import re
+        export GALAXY_WORKING_DIR=`pwd` &&
+        mkdir -p ./jupyter/outputs/ &&
+        mkdir -p ./jupyter/data &&
+        mkdir -p ./jupyter/notebooks &&
+
+        ## change into the directory where the notebooks are located
+        cd ./jupyter/ &&
+        export HOME=/home/jovyan/ &&
+        export PATH=/home/jovyan/.local/bin:\$PATH &&
+
+        #if $mode.mode == 'scratch'
+            ## copy all notebooks, workflows and data
+            cp /home/jovyan/mgnify-examples/home.ipynb ./ &&
+            cp -r /home/jovyan/mgnify-examples/* ./notebooks/ &&
+            ## provide all rights to copied files
+            jupyter trust ./home.ipynb &&
+            jupyter trust ./notebooks/*/*.ipynb &&
+            jupyter lab --allow-root --no-browser --LabApp.token=''
+        #else
+            #set $noteboook_name = re.sub('[^\w\-\.\s]', '_', str($mode.ipynb.element_identifier))
+            cp '$mode.ipynb' './${noteboook_name}.ipynb' &&
+            jupyter trust './${noteboook_name}.ipynb' &&
+            #if $mode.run_it
+                jupyter nbconvert --to notebook --execute --output ./ipython_galaxy_notebook.ipynb --allow-errors  ./*.ipynb &&
+                #set $noteboook_name = 'ipython_galaxy_notebook'
+            #else
+                jupyter lab --allow-root --no-browser --LabApp.token='' &&
+            #end if
+            cp './${noteboook_name}.ipynb' '$jupyter_notebook'
+        #end if
+    ]]>
+    </command>
+    <inputs>
+        <conditional name="mode">
+            <param name="mode" type="select" label="Do you already have a notebook?" help="If not, no problem we will provide you with a default one.">
+                <option value="scratch">Start with a fresh notebook</option>
+                <option value="previous">Load a previous notebook</option>
+            </param>
+            <when value="scratch">
+                <!--<conditional name="lang">
+                    <param name="lang" type="select" label="Programming language to use">
+                        <option value="R Examples">R</option>
+                        <option value="Python Examples">Python</option>
+                    </param>
+                    <when value="R Examples">
+                        <param name="notebook" type="select" label="Notebook to use">
+                            <option value="Comparative Metagenomics">Comparative Metagenomics</option>
+                            <option value="Fetch Analyses metadata for a Study">Fetch Analyses metadata for a Study</option>
+                            <option value="Search for Samples or Studies">Search for Samples or Studies</option>
+                        </param>
+                    </when>
+                    <when value="Python Examples">
+                        <param name="notebook" type="select" label="Notebook to use">
+                            <option value="Download paginated API data to a CSV">Download paginated API data to a CSV</option>
+                            <option value="Load Analyses for a MGnify Study">Load Analyses for a MGnify Study</option>
+                        </param>
+                    </when>
+                </conditional>-->
+            </when>
+            <when value="previous">
+                <param name="ipynb" type="data" format="ipynb" label="IPython Notebook"/>
+                <param name="run_it" type="boolean" truevalue="true" falsevalue="false" label="Execute notebook and return a new one."
+                    help="This option is useful in workflows when you just want to execute a notebook and not dive into the webfrontend."/>
+            </when>
+        </conditional>
+    </inputs>
+    <outputs>
+        <data name="jupyter_notebook" format="ipynb" label="Executed Mgnify Notebook"></data>
+    </outputs>
+    <tests>
+        <test expect_num_outputs="1">
+            <param name="mode" value="previous" />
+            <param name="ipynb" value="test.ipynb" />
+            <param name="run_it" value="true" />
+            <output name="jupyter_notebook" file="test.ipynb" ftype="ipynb"/>
+        </test>
+    </tests>
+    <help><![CDATA[
+
+The notebooks in this Jupyter Lab environment allows to explore programmatic access to `MGnify <https://www.ebi.ac.uk/metagenomics/>`_'s datasets using Python or with R using the `MGnifyR <https://github.com/beadyallen/MGnifyR>`_ package.
+
+Why such notebooks?
+-------------------
+
+The quantity and richness of `metagenomics-derived data <https://www.ebi.ac.uk/metagenomics/search>`_ in MGnify grows every day. The `MGnify website <https://www.ebi.ac.uk/metagenomics/>`_ is the best place to start exploring and searching the MGnify database, and allows users to download modest query results as CSV tables.
+
+For larger queries, or more complex requirements like fetching metadata from samples across multiple studies, a programmatic access approach is far better.
+
+Programmatic access - fetching data from MGnify using a terminal command or code script - uses the `MGnify API <https://docs.mgnify.org/en/latest/api.html>`_ (`Application Programming Interface <https://en.wikipedia.org/wiki/API>`_). The API provides access to every data type in MGnify: `Studies <https://www.ebi.ac.uk/metagenomics/api/v1/studies>`_, `Samples <https://www.ebi.ac.uk/metagenomics/api/v1/samples>`_, `Analyses <https://www.ebi.ac.uk/metagenomics/api/v1/analyses>`_, `Annotations <https://www.ebi.ac.uk/metagenomics/api/v1/annotations/interpro-identifiers>`_, `MAGs <https://www.ebi.ac.uk/metagenomics/api/v1/genome-catalogues>`_ etc: it is what lies behind the MGnify website. Using the API means you can fetch more data than is possible via the website, and can help you write reproducible analysis scripts.
+
+The API can be explored interactively online, using the `API Browser <https://www.ebi.ac.uk/metagenomics/api/v1/>`_. But actually using the API first requires knowledge and/or installation of tools on your computer. This might range from a command line tool like `cURL <https://curl.se/>`_, to learning R and setting up the `R Studio <https://www.rstudio.com/>`_ application, to setting up a `Python <https://www.python.org/>`_ environment and installing a suite of `packages used for data analysis <https://pandas.pydata.org/>`_. Second, the API returns most data in `JSON format <https://developer.mozilla.org/en-US/docs/Learn/JavaScript/Objects/JSON>`_: this is standard on the web, but less familiar for bioinformaticians used to TSVs and dataframes.
+
+The `MGnify Notebook Server <http://notebooks.mgnify.org/>`_ and `MGnifyR package <https://github.com/beadyallen/MGnifyR>`_ are designed to bridge these gaps. Users can launch an online R and Python coding environment in their browser, without installing anything. The environment is hosted by EMBL's `Cell Biology and Biophysics Computational Support team <https://www.embl.org/research/units/cell-biology-biophysics/cbbcs/>`_, who support computational projects across EMBL. It already includes the main libraries needed for communicating with the MGnify API, analysing data, and making plots. It uses the popular `Jupyter Lab <https://jupyter.org/>`_ software, which means you can code inside `Notebooks <https://jupyter-notebook.readthedocs.io/en/latest/>`_: interactive code documents.
+
+There are example Notebooks written in both R and Python, so users can pick whichever they're more familiar with.
+   ]]></help>
+</tool>
diff --git a/tools/interactive/interactivetool_pavian.xml b/tools/interactive/interactivetool_pavian.xml
new file mode 100644
index 00000000000..fd09edafcb9
--- /dev/null
+++ b/tools/interactive/interactivetool_pavian.xml
@@ -0,0 +1,54 @@
+<tool id="interactive_tool_pavian" tool_type="interactive" name="Pavian" version="1.0" profile="22.01">
+    <description>Interactive analysis of metagenomics data</description>
+    <requirements>
+        <container type="docker">quay.io/galaxy/pavian:0.1</container>
+    </requirements>
+    <entry_points>
+        <entry_point name="Pavian visualisation" requires_domain="True">
+            <port>80</port>
+            <url>/</url>
+        </entry_point>
+    </entry_points>
+    <command><![CDATA[
+#import re
+#if $infile
+    #for $input in $infile
+        #set link_name = re.sub('[^\w\-\.]', '_', str($input.element_identifier))
+        ln -s '$input' '/home/shiny/$link_name' &&
+    #end for
+#end if
+cat '$shiny' /srv/shiny-server/app.R > /tmp/foo.R &&
+mv /tmp/foo.R /srv/shiny-server/app.R &&
+/usr/bin/shiny-server.sh
+    ]]>
+    </command>
+    <configfiles>
+        <configfile name="shiny"><![CDATA[
+options(pavian.load_server_directory=TRUE);
+options(pavian.server_access=TRUE);
+options(shiny.maxRequestSize=500*1024^2);
+options(pavian.server_dir="/home/shiny/")
+        ]]></configfile>
+    </configfiles>
+    <inputs>
+        <param name="infile" type="data" multiple="true" optional="true" format="tabular" 
+            label="Kraken and MetaPhlAn-style report(s)" 
+            help="Centrifuge results can be used after running centrifuge-kreport on Centrifuge output files, and Kaiju results by running kraken-report on Kaiju output file"/>
+    </inputs>
+    <outputs>
+        <data name="outfile" format="txt" />
+    </outputs>
+    <tests>
+    </tests>
+    <help>
+<![CDATA[
+
+`Pavian <https://github.com/fbreitwieser/pavian>`_  is a interactive browser application for analyzing and visualization metagenomics classification results from classifiers such as Kraken, KrakenUniq, Kraken 2, Centrifuge and MetaPhlAn. Pavian also provides an alignment viewer for validation of matches to a particular genome.
+
+pavian natively supports the Kraken and MetaPhlAn-style report formats. In extension, you can use Centrifuge results by running centrifuge-report on Centrifuge output files, and Kaiju results by running kraken-report on Kaiju output files.
+]]>
+    </help>
+    <citations>
+           <citation type="doi">10.1093/bioinformatics/btz715</citation>
+    </citations>
+</tool>
diff --git a/tools/stats/filtering.py b/tools/stats/filtering.py
index 840070a1da4..125c85ac026 100644
--- a/tools/stats/filtering.py
+++ b/tools/stats/filtering.py
@@ -288,7 +288,7 @@ first_invalid_line = 0
 invalid_line = None
 lines_kept = 0
 total_lines = 0
-out = open(out_fname, "wt")
+out = open(out_fname, "w")
 
 # Read and filter input file, skipping invalid lines
 code = """
diff --git a/tox.ini b/tox.ini
index bb0c5b5d95e..46b8b4f4134 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,6 +7,9 @@ skipsdist = True
 [testenv]
 commands =
     first_startup: bash .ci/first_startup.sh
+    lint: ruff .
+    # Once we are happy to replace flake8 with ruff, we can replace the next line with `black --check --diff`
+    # (since ruff delegates to black for checking/fixing many rules).
     lint: bash .ci/flake8_wrapper.sh
     lint_docstring: bash .ci/flake8_wrapper_docstrings.sh --exclude
     lint_docstring_include_list: bash .ci/flake8_wrapper_docstrings.sh --include
@@ -16,11 +19,12 @@ commands =
     mypy: mypy test lib
     test_galaxy_packages: make generate-cwl-conformance-tests
     test_galaxy_packages: bash packages/test.sh
-whitelist_externals =
+allowlist_externals =
     bash
     make
-passenv = 
-    CI CONDA_EXE
+passenv =
+    CI
+    CONDA_EXE
     GALAXY_CONFIG_OVERRIDE_DATABASE_CONNECTION
     APP_WEBSERVER
     TERM
@@ -55,7 +59,7 @@ commands = bash .ci/validate_test_tools.sh
 commands = bash .ci/check_controller.sh
 
 [testenv:check_indexes]
-commands = 
+commands =
     bash scripts/common_startup.sh
     bash manage_db.sh init
     bash check_model.sh
diff --git a/tsconfig.js b/tsconfig.json
similarity index 100%
rename from tsconfig.js
rename to tsconfig.json