@@ -12,7 +12,7 @@
diff --git a/client/src/utils/navigation/navigation.yml b/client/src/utils/navigation/navigation.yml
index 6c2ecc384815..f97006e4b7a5 100644
--- a/client/src/utils/navigation/navigation.yml
+++ b/client/src/utils/navigation/navigation.yml
@@ -589,8 +589,8 @@ workflow_editor:
output_terminal: "${_} [output-name='${name}']"
input_terminal: "${_} [input-name='${name}']"
input_mapping_icon: "${_} [input-name='${name}'].multiple"
- workflow_output_toggle: "${_} .callout-terminal.${name}"
- workflow_output_toggle_active: "${_} .callout-terminal.${name} .mark-terminal-active"
+ workflow_output_toggle: "${_} [data-output-name='${name}'] .callout-terminal "
+ workflow_output_toggle_active: "${_} [data-output-name='${name}'] .mark-terminal-active"
selectors:
canvas_body: '#workflow-canvas'
edit_annotation: '#workflow-annotation'
From 767bb5c941e008de9bc1cce6974547382ae637bc Mon Sep 17 00:00:00 2001
From: Nate Coraor
Date: Mon, 13 Mar 2023 19:44:09 -0400
Subject: [PATCH 19/27] Bump Gravity to 1.0.1
---
lib/galaxy/dependencies/pinned-requirements.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt
index 4ed02503ba09..169b2e004d1e 100644
--- a/lib/galaxy/dependencies/pinned-requirements.txt
+++ b/lib/galaxy/dependencies/pinned-requirements.txt
@@ -70,7 +70,7 @@ funcsigs==1.0.2 ; python_version >= "3.7" and python_version < "3.12"
future==0.18.3 ; python_version >= "3.7" and python_version < "3.12"
galaxy-sequence-utils==1.1.5 ; python_version >= "3.7" and python_version < "3.12"
galaxy2cwl==0.1.4 ; python_version >= "3.7" and python_version < "3.12"
-gravity==1.0.0 ; python_version >= "3.7" and python_version < "3.12"
+gravity==1.0.1 ; python_version >= "3.7" and python_version < "3.12"
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.12"
gunicorn==20.1.0 ; python_version >= "3.7" and python_version < "3.12"
gxformat2==0.17.0 ; python_version >= "3.7" and python_version < "3.12"
From 337f58493684f0f0d7f8c568e9c386f6157e2d5d Mon Sep 17 00:00:00 2001
From: Ahmed Awan
Date: Mon, 13 Mar 2023 22:13:14 -0400
Subject: [PATCH 20/27] Allow hyphenated tool-name to be searchable in
`ToolSearch`
---
.../components/Panels/Common/ToolSearch.vue | 2 +-
client/src/components/Panels/utilities.js | 2 ++
.../src/components/Panels/utilities.test.js | 22 +++++++++++++++++++
3 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/client/src/components/Panels/Common/ToolSearch.vue b/client/src/components/Panels/Common/ToolSearch.vue
index 2181b2fc3494..a47cada13c01 100644
--- a/client/src/components/Panels/Common/ToolSearch.vue
+++ b/client/src/components/Panels/Common/ToolSearch.vue
@@ -110,7 +110,7 @@ export default {
this.$emit("onResults", this.favoritesResults);
} else {
// keys with sorting order
- const keys = { exact: 3, name: 2, description: 1, combined: 0 };
+ const keys = { exact: 4, name: 3, description: 2, combined: 1, hyphenated: 0 };
this.$emit("onResults", searchToolsByKeys(this.toolsList, keys, q));
}
} else {
diff --git a/client/src/components/Panels/utilities.js b/client/src/components/Panels/utilities.js
index e7c99f04b51e..2002922f037b 100644
--- a/client/src/components/Panels/utilities.js
+++ b/client/src/components/Panels/utilities.js
@@ -92,6 +92,8 @@ export function searchToolsByKeys(tools, keys, query) {
let actualValue = "";
if (key === "combined") {
actualValue = tool.name.toLowerCase() + " " + tool.description.toLowerCase();
+ } else if (key === "hyphenated") {
+ actualValue = tool.name.toLowerCase().replaceAll("-", " ");
} else {
actualValue = tool[key] ? tool[key].toLowerCase() : "";
}
diff --git a/client/src/components/Panels/utilities.test.js b/client/src/components/Panels/utilities.test.js
index 3c410cc6c7ee..059ccd1b2c92 100644
--- a/client/src/components/Panels/utilities.test.js
+++ b/client/src/components/Panels/utilities.test.js
@@ -44,6 +44,28 @@ describe("test helpers in tool searching utilities", () => {
keys = { description: 1, name: 2, combined: 0 };
results = searchToolsByKeys(normalizeTools(toolsList), keys, q);
expect(results).toEqual(expectedResults);
+
+ const tempToolsList = [
+ {
+ elems: [
+ {
+ panel_section_name: "Collection Operations",
+ description: "Extract UMI from fastq files",
+ id: "toolshed.g2.bx.psu.edu/repos/iuc/umi_tools_extract/umi_tools_extract/1.1.2+galaxy2",
+ name: "UMI-tools extract",
+ },
+ ],
+ model_class: "ToolSection",
+ id: "fasta/fastq",
+ name: "FASTA/FASTQ",
+ },
+ ];
+ // hyphenated tool-name is searchable
+ q = "uMi tools extract ";
+ expectedResults = ["toolshed.g2.bx.psu.edu/repos/iuc/umi_tools_extract/umi_tools_extract/1.1.2+galaxy2"];
+ keys = { description: 1, name: 2, hyphenated: 0 };
+ results = searchToolsByKeys(normalizeTools(tempToolsList), keys, q);
+ expect(results).toEqual(expectedResults);
});
it("test tool filtering helpers on toolsList given list of ids", async () => {
From b36c55a1a150ae207644e00777735eb52d2485a5 Mon Sep 17 00:00:00 2001
From: Ahmed Awan
Date: Mon, 13 Mar 2023 22:16:36 -0400
Subject: [PATCH 21/27] fix tempToolsList section name
---
client/src/components/Panels/utilities.test.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/src/components/Panels/utilities.test.js b/client/src/components/Panels/utilities.test.js
index 059ccd1b2c92..9c8cb6627818 100644
--- a/client/src/components/Panels/utilities.test.js
+++ b/client/src/components/Panels/utilities.test.js
@@ -49,7 +49,7 @@ describe("test helpers in tool searching utilities", () => {
{
elems: [
{
- panel_section_name: "Collection Operations",
+ panel_section_name: "FASTA/FASTQ",
description: "Extract UMI from fastq files",
id: "toolshed.g2.bx.psu.edu/repos/iuc/umi_tools_extract/umi_tools_extract/1.1.2+galaxy2",
name: "UMI-tools extract",
From 8dc65edc39c5bb9c0a8f6aad8ffcb1d7dea1440f Mon Sep 17 00:00:00 2001
From: Ahmed Awan
Date: Mon, 13 Mar 2023 22:41:12 -0400
Subject: [PATCH 22/27] prioritize over
---
client/src/components/Panels/Common/ToolSearch.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/src/components/Panels/Common/ToolSearch.vue b/client/src/components/Panels/Common/ToolSearch.vue
index a47cada13c01..a106ae2c0fcd 100644
--- a/client/src/components/Panels/Common/ToolSearch.vue
+++ b/client/src/components/Panels/Common/ToolSearch.vue
@@ -110,7 +110,7 @@ export default {
this.$emit("onResults", this.favoritesResults);
} else {
// keys with sorting order
- const keys = { exact: 4, name: 3, description: 2, combined: 1, hyphenated: 0 };
+ const keys = { exact: 4, name: 3, hyphenated: 2, description: 1, combined: 0 };
this.$emit("onResults", searchToolsByKeys(this.toolsList, keys, q));
}
} else {
From 7985e0bd1d26adab4928a9917a4296b199a55364 Mon Sep 17 00:00:00 2001
From: John Chilton
Date: Tue, 14 Mar 2023 09:08:23 -0400
Subject: [PATCH 23/27] Fix regression in distinguishing between select and
text types.
Previously if 'type' was missing but 'options' were present the form input would be rendered as a select box and not a text box. This can be seen as a problem when adding new quota objects in the admin menu.
---
client/src/components/Form/FormElement.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/src/components/Form/FormElement.vue b/client/src/components/Form/FormElement.vue
index 688e60357be9..e0e79ebc08eb 100644
--- a/client/src/components/Form/FormElement.vue
+++ b/client/src/components/Form/FormElement.vue
@@ -270,7 +270,7 @@ const isOptional = computed(() => !isRequired.value && attrs.value["optional"] !
:id="props.id"
v-model="currentValue"
:data-label="props.title"
- :type="props.type ?? 'text'"
+ :type="props.type ?? (attrs.options ? 'select' : 'text')"
:attributes="attrs" />
From 446d3128326dd6714a9a468388727d413548253c Mon Sep 17 00:00:00 2001
From: John Davis
Date: Tue, 14 Mar 2023 10:22:07 -0400
Subject: [PATCH 24/27] Fix typo in comment
---
lib/galaxy/config/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/galaxy/config/__init__.py b/lib/galaxy/config/__init__.py
index 8538ca884ff9..e180463793d5 100644
--- a/lib/galaxy/config/__init__.py
+++ b/lib/galaxy/config/__init__.py
@@ -1279,7 +1279,7 @@ def check(self):
def is_fetch_with_celery_enabled(self):
"""
- True iff celery is enabled and celery_conf["task_routes"]["galaxy.fetch_data"] == DISABLED_FLAG.
+ True iff celery is enabled and celery_conf["task_routes"]["galaxy.fetch_data"] != DISABLED_FLAG.
"""
celery_enabled = self.enable_celery_tasks
try:
From c0ebe9fdb021e6d3dd7db13f6197d62df8f15fa8 Mon Sep 17 00:00:00 2001
From: mvdbeek
Date: Wed, 15 Mar 2023 12:06:43 +0100
Subject: [PATCH 25/27] Bump tuswsgi middleware
The middleware attempts to cleanup files on every upload,
this can be a problem if there are many files in the upload
directory, especially on NFS.
---
lib/galaxy/dependencies/dev-requirements.txt | 2 +-
lib/galaxy/dependencies/pinned-requirements.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/galaxy/dependencies/dev-requirements.txt b/lib/galaxy/dependencies/dev-requirements.txt
index d28bada04ade..2de873dbd204 100644
--- a/lib/galaxy/dependencies/dev-requirements.txt
+++ b/lib/galaxy/dependencies/dev-requirements.txt
@@ -227,7 +227,7 @@ tqdm==4.64.0; python_version >= "2.7" and python_full_version < "3.0.0" or pytho
trio-websocket==0.9.2; python_version >= "3.7" and python_version < "4.0"
trio==0.21.0; python_version >= "3.7" and python_version < "4.0"
tuspy==0.2.5
-tuswsgi==0.5.4
+tuswsgi==0.5.5
twill==3.0.2
typed-ast==1.5.4; python_version < "3.8" and implementation_name == "cpython" and python_full_version >= "3.6.2" and python_version >= "3.7"
typing-extensions==4.2.0; python_version >= "3.7"
diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt
index 74f8f510fc70..9e4d35bb5bdc 100644
--- a/lib/galaxy/dependencies/pinned-requirements.txt
+++ b/lib/galaxy/dependencies/pinned-requirements.txt
@@ -159,7 +159,7 @@ tenacity==8.0.1; python_version >= "3.6"
tifffile==2021.11.2; python_version >= "3.7"
tornado==6.1; python_version >= "3.5"
tqdm==4.64.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0"
-tuswsgi==0.5.4
+tuswsgi==0.5.5
typing-extensions==4.2.0; python_version >= "3.7"
tzlocal==2.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4"
ubiquerg==0.6.2
From 87a887ac55bd98da3bb653eca7e3f90445cf0e36 Mon Sep 17 00:00:00 2001
From: Dannon Baker
Date: Wed, 15 Mar 2023 09:02:40 -0400
Subject: [PATCH 26/27] Webpack dependency updates to address dependabot alert
---
client/package.json | 6 +-
client/yarn.lock | 148 +++++++++++++++++++++++++++++---------------
2 files changed, 101 insertions(+), 53 deletions(-)
diff --git a/client/package.json b/client/package.json
index c0de3eb9c0ea..3a8b9082d72b 100644
--- a/client/package.json
+++ b/client/package.json
@@ -193,9 +193,9 @@
"typescript-eslint": "^0.0.1-alpha.0",
"vue-loader": "^15.10.0",
"vue-template-compiler": "^2.7.8",
- "webpack": "^5.73.0",
- "webpack-cli": "^4.10.0",
- "webpack-dev-server": "^4.9.3",
+ "webpack": "^5.76.1",
+ "webpack-cli": "^5.0.1",
+ "webpack-dev-server": "^4.12.0",
"webpack-merge": "^5.8.0",
"yaml-jest": "^1.2.0",
"yaml-loader": "^0.8.0"
diff --git a/client/yarn.lock b/client/yarn.lock
index 4bafa2809c8f..e85e2503bc23 100644
--- a/client/yarn.lock
+++ b/client/yarn.lock
@@ -2705,22 +2705,20 @@
"@webassemblyjs/ast" "1.11.1"
"@xtuc/long" "4.2.2"
-"@webpack-cli/configtest@^1.2.0":
- version "1.2.0"
- resolved "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz"
- integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==
+"@webpack-cli/configtest@^2.0.1":
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-2.0.1.tgz#a69720f6c9bad6aef54a8fa6ba9c3533e7ef4c7f"
+ integrity sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==
-"@webpack-cli/info@^1.5.0":
- version "1.5.0"
- 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/info@^2.0.1":
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-2.0.1.tgz#eed745799c910d20081e06e5177c2b2569f166c0"
+ integrity sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==
-"@webpack-cli/serve@^1.7.0":
- version "1.7.0"
- resolved "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz"
- integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==
+"@webpack-cli/serve@^2.0.1":
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-2.0.1.tgz#34bdc31727a1889198855913db2f270ace6d7bf8"
+ integrity sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==
"@xtuc/ieee754@^1.2.0":
version "1.2.0"
@@ -3865,7 +3863,7 @@ combined-stream@^1.0.8:
dependencies:
delayed-stream "~1.0.0"
-commander@7, commander@7.2.0, commander@^7.0.0, commander@^7.2.0:
+commander@7, commander@7.2.0, commander@^7.2.0:
version "7.2.0"
resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
@@ -3880,6 +3878,11 @@ commander@^9.2.0:
resolved "https://registry.npmjs.org/commander/-/commander-9.4.0.tgz"
integrity sha512-sRPT+umqkz90UA8M1yqYfnHlZA7fF6nSphDtxeywPZ49ysjxDQybzk13CL+mXekDRG92skbcqCLVovuCusNmFw==
+commander@^9.4.1:
+ version "9.5.0"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30"
+ integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==
+
component-emitter@^1.2.1, component-emitter@~1.3.0:
version "1.3.0"
resolved "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"
@@ -6475,10 +6478,10 @@ interpret@^1.4.0:
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.npmjs.org/interpret/-/interpret-2.2.0.tgz"
- integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
+interpret@^3.1.1:
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
+ integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
invert-kv@^1.0.0:
version "1.0.0"
@@ -7683,6 +7686,14 @@ last-run@^1.1.0:
default-resolution "^2.0.0"
es6-weak-map "^2.0.1"
+launch-editor@^2.6.0:
+ version "2.6.0"
+ resolved "https://registry.yarnpkg.com/launch-editor/-/launch-editor-2.6.0.tgz#4c0c1a6ac126c572bd9ff9a30da1d2cae66defd7"
+ integrity sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==
+ dependencies:
+ picocolors "^1.0.0"
+ shell-quote "^1.7.3"
+
lazystream@^1.0.0:
version "1.0.1"
resolved "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz"
@@ -9505,12 +9516,12 @@ rechoir@^0.6.2:
dependencies:
resolve "^1.1.6"
-rechoir@^0.7.0:
- version "0.7.1"
- resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz"
- integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
+rechoir@^0.8.0:
+ version "0.8.0"
+ resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"
+ integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==
dependencies:
- resolve "^1.9.0"
+ resolve "^1.20.0"
redent@^3.0.0:
version "3.0.0"
@@ -9747,7 +9758,7 @@ resolve.exports@^1.1.0:
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:
+resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.4.0:
version "1.22.1"
resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"
integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==
@@ -9939,10 +9950,10 @@ select-hose@^2.0.0:
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.npmjs.org/selfsigned/-/selfsigned-2.0.1.tgz"
- integrity sha512-LmME957M1zOsUhG+67rAjKfiWFox3SBxE/yymatMZsAx+oMrJ0YQ8AToOnyCm7xbeg2ep37IHLxdu0o2MavQOQ==
+selfsigned@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.1.1.tgz#18a7613d714c0cd3385c48af0075abf3f266af61"
+ integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==
dependencies:
node-forge "^1"
@@ -10082,6 +10093,11 @@ shebang-regex@^3.0.0:
resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+shell-quote@^1.7.3:
+ version "1.8.0"
+ resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.0.tgz#20d078d0eaf71d54f43bd2ba14a1b5b9bfa5c8ba"
+ integrity sha512-QHsz8GgQIGKlRi24yFc6a6lN69Idnx634w49ay6+jA5yFh7a1UY+4Rp6HPx/L/1zcEDPEij8cIsiqR6bQsE5VQ==
+
side-channel@^1.0.4:
version "1.0.4"
resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"
@@ -11428,22 +11444,23 @@ webidl-conversions@^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.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz"
- integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==
+webpack-cli@^5.0.1:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-5.0.1.tgz#95fc0495ac4065e9423a722dec9175560b6f2d9a"
+ integrity sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==
dependencies:
"@discoveryjs/json-ext" "^0.5.0"
- "@webpack-cli/configtest" "^1.2.0"
- "@webpack-cli/info" "^1.5.0"
- "@webpack-cli/serve" "^1.7.0"
+ "@webpack-cli/configtest" "^2.0.1"
+ "@webpack-cli/info" "^2.0.1"
+ "@webpack-cli/serve" "^2.0.1"
colorette "^2.0.14"
- commander "^7.0.0"
+ commander "^9.4.1"
cross-spawn "^7.0.3"
+ envinfo "^7.7.3"
fastest-levenshtein "^1.0.12"
import-local "^3.0.2"
- interpret "^2.2.0"
- rechoir "^0.7.0"
+ interpret "^3.1.1"
+ rechoir "^0.8.0"
webpack-merge "^5.7.3"
webpack-dev-middleware@^5.3.1:
@@ -11457,10 +11474,10 @@ webpack-dev-middleware@^5.3.1:
range-parser "^1.2.1"
schema-utils "^4.0.0"
-webpack-dev-server@^4.9.3:
- version "4.10.0"
- resolved "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.10.0.tgz"
- integrity sha512-7dezwAs+k6yXVFZ+MaL8VnE+APobiO3zvpp3rBHe/HmWQ+avwh0Q3d0xxacOiBybZZ3syTZw9HXzpa3YNbAZDQ==
+webpack-dev-server@^4.12.0:
+ version "4.12.0"
+ resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.12.0.tgz#e2dcad4d43e486c3bac48ddbf346e77ef03c7428"
+ integrity sha512-XRN9YRnvOj3TQQ5w/0pR1y1xDcVnbWtNkTri46kuEbaWUPTHsWUvOyAAI7PZHLY+hsFki2kRltJjKMw7e+IiqA==
dependencies:
"@types/bonjour" "^3.5.9"
"@types/connect-history-api-fallback" "^1.3.5"
@@ -11481,16 +11498,17 @@ webpack-dev-server@^4.9.3:
html-entities "^2.3.2"
http-proxy-middleware "^2.0.3"
ipaddr.js "^2.0.1"
+ launch-editor "^2.6.0"
open "^8.0.9"
p-retry "^4.5.0"
rimraf "^3.0.2"
schema-utils "^4.0.0"
- selfsigned "^2.0.1"
+ selfsigned "^2.1.1"
serve-index "^1.9.1"
sockjs "^0.3.24"
spdy "^4.0.2"
webpack-dev-middleware "^5.3.1"
- ws "^8.4.2"
+ ws "^8.13.0"
webpack-merge@^4.1.5:
version "4.2.2"
@@ -11512,7 +11530,7 @@ webpack-sources@^3.2.3:
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:
+"webpack@>=4.0.0 <6.0.0":
version "5.74.0"
resolved "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz"
integrity sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==
@@ -11542,6 +11560,36 @@ webpack-sources@^3.2.3:
watchpack "^2.4.0"
webpack-sources "^3.2.3"
+webpack@^5.76.1:
+ version "5.76.1"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.1.tgz#7773de017e988bccb0f13c7d75ec245f377d295c"
+ integrity sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==
+ dependencies:
+ "@types/eslint-scope" "^3.7.3"
+ "@types/estree" "^0.0.51"
+ "@webassemblyjs/ast" "1.11.1"
+ "@webassemblyjs/wasm-edit" "1.11.1"
+ "@webassemblyjs/wasm-parser" "1.11.1"
+ acorn "^8.7.1"
+ acorn-import-assertions "^1.7.6"
+ browserslist "^4.14.5"
+ chrome-trace-event "^1.0.2"
+ enhanced-resolve "^5.10.0"
+ es-module-lexer "^0.9.0"
+ eslint-scope "5.1.1"
+ events "^3.2.0"
+ glob-to-regexp "^0.4.1"
+ graceful-fs "^4.2.9"
+ json-parse-even-better-errors "^2.3.1"
+ loader-runner "^4.2.0"
+ mime-types "^2.1.27"
+ neo-async "^2.6.2"
+ schema-utils "^3.1.0"
+ tapable "^2.1.1"
+ terser-webpack-plugin "^5.1.3"
+ watchpack "^2.4.0"
+ webpack-sources "^3.2.3"
+
websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
version "0.7.4"
resolved "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"
@@ -11710,10 +11758,10 @@ ws@^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.npmjs.org/ws/-/ws-8.8.1.tgz"
- integrity sha512-bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==
+ws@^8.13.0:
+ version "8.13.0"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0"
+ integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==
ws@~8.2.3:
version "8.2.3"
From 08b4536bd88627d2dec0f5492ca42571616da5d8 Mon Sep 17 00:00:00 2001
From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com>
Date: Tue, 14 Mar 2023 11:03:33 +0100
Subject: [PATCH 27/27] remove any type add annotation
---
client/src/utils/pushOrSet.ts | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/client/src/utils/pushOrSet.ts b/client/src/utils/pushOrSet.ts
index de24c991c445..b38886bd86b6 100644
--- a/client/src/utils/pushOrSet.ts
+++ b/client/src/utils/pushOrSet.ts
@@ -1,6 +1,12 @@
-export function pushOrSet(object: { [index: string | number]: any[] }, key: string | number, value: any) {
+/**
+ * Pushes a value to an array in an object, if the array exists. Else creates a new array containing value.
+ * @param object Object which contains array
+ * @param key Key which array is in
+ * @param value Value to push
+ */
+export function pushOrSet(object: { [key in K]: Array }, key: K, value: T) {
if (key in object) {
- object[key].push(value);
+ object[key]!.push(value);
} else {
object[key] = [value];
}