X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/c29de730b2cf8582667e21bc985530a804797186..HEAD:/src/components/warning/warning.tsx
diff --git a/src/components/warning/warning.tsx b/src/components/warning/warning.tsx
index 728cb45a..d459a37d 100644
--- a/src/components/warning/warning.tsx
+++ b/src/components/warning/warning.tsx
@@ -2,10 +2,12 @@
//
// SPDX-License-Identifier: AGPL-3.0
-import * as React from "react";
-import { ErrorIcon } from "~/components/icon/icon";
-import { disallowSlash } from "~/validators/valid-name";
+import React from "react";
+import { ErrorIcon } from "components/icon/icon";
import { Tooltip } from "@material-ui/core";
+import { disallowSlash } from "validators/valid-name";
+import { connect } from "react-redux";
+import { RootState } from "store/store";
interface WarningComponentProps {
text: string;
@@ -14,17 +16,26 @@ interface WarningComponentProps {
}
export const WarningComponent = ({ text, rules, message }: WarningComponentProps) =>
- rules.find(aRule => text.match(aRule) !== null)
- ? message
- ?
- :
- : null;
+ !text ?
+ : (rules.find(aRule => text.match(aRule) !== null)
+ ? message
+ ?
+ :
+ : null);
interface IllegalNamingWarningProps {
name: string;
+ validate: RegExp[];
}
-export const IllegalNamingWarning = ({ name }: IllegalNamingWarningProps) =>
- ;
+
+export const IllegalNamingWarning = connect(
+ (state: RootState) => {
+ return {
+ validate: (state.auth.config.clusterConfig.Collections.ForwardSlashNameSubstitution === "" ?
+ [disallowSlash] : [])
+ };
+ })(({ name, validate }: IllegalNamingWarningProps) =>
+ );