Client fixes for sts...

Author: jmchilton

client/src/components/Tool/ToolForm.vue

@@ -114,7 +114,8 @@ import axios from "axios";
 import { getAppRoot } from "onload/loadConfig";
 import { mapActions, mapState, storeToRefs } from "pinia";
 
-import { canMutateHistory, getToolInputs } from "@/api";
+import { canMutateHistory } from "@/api";
+import { getToolInputs } from "@/api/tools"
 import { useUserToolCredentials } from "@/composables/userToolCredentials";
 import { useConfigStore } from "@/stores/configurationStore";
 import { useHistoryItemsStore } from "@/stores/historyItemsStore";

client/src/components/Tool/structured.ts

@@ -442,7 +442,7 @@ function validateParameter(inputKey: string, inputValue: any, parameterModel: To
                             if (shouldFail) {
                                 return false;
                             }
-                        } else if (validator.expression && (/^[\^$.*+?()\[\]{}|\\-]/.test(validator.expression) || validator.expression.includes(".*") || validator.expression.endsWith("$"))) {
+                        } else if (validator.expression && (/^[\^$.*+?()[\]{}|\\-]/.test(validator.expression) || validator.expression.includes(".*") || validator.expression.endsWith("$"))) {
                             // Try to treat as regex if it looks like a regex pattern
                             try {
                                 const regex = new RegExp(validator.expression);
@@ -639,7 +639,7 @@ function validateParameter(inputKey: string, inputValue: any, parameterModel: To
                             if (shouldFail) {
                                 return false;
                             }
-                        } else if (validator.expression && (/^[\^$.*+?()\[\]{}|\\-]/.test(validator.expression) || validator.expression.includes(".*") || validator.expression.endsWith("$"))) {
+                        } else if (validator.expression && (/^[\^$.*+?()[\]{}|\\-]/.test(validator.expression) || validator.expression.includes(".*") || validator.expression.endsWith("$"))) {
                             // Try to treat as regex if it looks like a regex pattern
                             try {
                                 const regex = new RegExp(validator.expression);