Merge branch '21128-toolbar-context-menu'

[arvados-workbench2.git] / src / components / warning / warning.tsx

diff --git a/src/components/warning/warning.tsx b/src/components/warning/warning.tsx
index 1a8f44562c99af72ead38972bf0d9b7c3690b223..d459a37db004b7f09e193dbaf83627d4c3118fbc 100644 (file)
--- a/src/components/warning/warning.tsx
+++ b/src/components/warning/warning.tsx
@@ -2,9 +2,12 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import * as React from "react";
-import { WarningIcon } from "~/components/icon/icon";
+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;
@@ -13,17 +16,26 @@ interface WarningComponentProps {
 }
 
 export const WarningComponent = ({ text, rules, message }: WarningComponentProps) =>
-    rules.find(aRule => text.match(aRule) !== null)
-    ? message
-        ? <Tooltip title={message}><WarningIcon /></Tooltip>
-        : <WarningIcon />
-    : null;
+    !text ? <Tooltip title={"No name"}><ErrorIcon /></Tooltip>
+        : (rules.find(aRule => text.match(aRule) !== null)
+            ? message
+                ? <Tooltip title={message}><ErrorIcon /></Tooltip>
+                : <ErrorIcon />
+            : null);
 
 interface IllegalNamingWarningProps {
     name: string;
+    validate: RegExp[];
 }
 
-export const IllegalNamingWarning = ({ name }: IllegalNamingWarningProps) =>
-    <WarningComponent
-        text={name} rules={[/\//, /^\.{1,2}$/]}
-        message="Names being '.', '..' or including '/' cause issues with WebDAV, please edit it to something different." />;
\ No newline at end of file
+
+export const IllegalNamingWarning = connect(
+    (state: RootState) => {
+        return {
+            validate: (state.auth.config.clusterConfig.Collections.ForwardSlashNameSubstitution === "" ?
+                [disallowSlash] : [])
+        };
+    })(({ name, validate }: IllegalNamingWarningProps) =>
+        <WarningComponent
+            text={name} rules={validate}
+            message="Names embedding '/' will be renamed or invisible to file system access (arv-mount or WebDAV)" />);