diff --git a/packages/dashboard/src/components/Form/FormSwitch.tsx b/packages/dashboard/src/components/Form/FormSwitch.tsx
new file mode 100644
index 00000000..65d5305a
--- /dev/null
+++ b/packages/dashboard/src/components/Form/FormSwitch.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { Input, Switch } from '@chakra-ui/react';
+import clsx from 'clsx';
+
+interface IProps {
+ placeholder?: string;
+ type?: Parameters
[0]['type'];
+ label?: string;
+ className?: string;
+ size?: Parameters[0]['size'];
+ checked?: boolean;
+}
+
+const FormSwitch: React.FC = ({ placeholder, type, label, className, size, ...rest }) => {
+ return (
+
+ {label && }
+
+
+ );
+};
+
+export default FormSwitch;
diff --git a/packages/dashboard/src/components/Form/validators.ts b/packages/dashboard/src/components/Form/validators.ts
index c22598d3..112954eb 100644
--- a/packages/dashboard/src/components/Form/validators.ts
+++ b/packages/dashboard/src/components/Form/validators.ts
@@ -1,12 +1,13 @@
import validator from 'validator';
import { FieldTypesEnum, FormField } from '../../generated/graphql';
+import { IFormValues } from '../../modules/Apps/components/InstallForm';
-const validateField = (field: FormField, value: string): string | undefined => {
+const validateField = (field: FormField, value: string | undefined | boolean): string | undefined => {
if (field.required && !value) {
return `${field.label} is required`;
}
- if (!value) {
+ if (!value || typeof value !== 'string') {
return;
}
@@ -59,12 +60,24 @@ const validateField = (field: FormField, value: string): string | undefined => {
}
};
-export const validateAppConfig = (values: Record, fields: FormField[]) => {
+const validateDomain = (domain?: string): string | undefined => {
+ if (!validator.isFQDN(domain || '')) {
+ return `${domain} must be a valid domain`;
+ }
+};
+
+export const validateAppConfig = (values: IFormValues, fields: FormField[]) => {
+ const { exposed, domain, ...config } = values;
+
const errors: any = {};
fields.forEach((field) => {
- errors[field.env_variable] = validateField(field, values[field.env_variable]);
+ errors[field.env_variable] = validateField(field, config[field.env_variable]);
});
+ if (exposed) {
+ errors.domain = validateDomain(domain);
+ }
+
return errors;
};
diff --git a/packages/dashboard/src/components/Layout/Header.tsx b/packages/dashboard/src/components/Layout/Header.tsx
index 72a0a0ea..dd57f313 100644
--- a/packages/dashboard/src/components/Layout/Header.tsx
+++ b/packages/dashboard/src/components/Layout/Header.tsx
@@ -2,6 +2,7 @@ import React from 'react';
import Link from 'next/link';
import { Flex } from '@chakra-ui/react';
import { FiMenu } from 'react-icons/fi';
+import { getUrl } from '../../core/helpers/url-helpers';
interface IProps {
onClickMenu: () => void;
@@ -16,7 +17,7 @@ const Header: React.FC = ({ onClickMenu }) => {
+ })