namirasoft-site-react 1.4.164 → 1.4.166

package/src/Validator.ts

@@ -1,136 +1,148 @@
-import { PhoneOperation } from "namirasoft-core";
-import { IValidationNumberProps } from "./props/IValidationNumberProps";
-import { IValidationProps } from "./props/IValidationProps";
-import { IValidationStringProps } from "./props/IValidationStringProps";
-import { DateSchema, DurationSchema, EmailSchema, IPV4Schema, IPV6Schema, TimeSchema } from "namirasoft-schema";
-
-export class Validator
-{
-    static getError(name: string, value: string | number | null | undefined, validator: IValidationProps): string | null
-    {
-        if (validator.required)
-            if (!value)
-                return `${name} is required.`;
-        if (value != null)
-            if (validator.regex)
-            {
-                if (!new RegExp(validator.regex.regex).test(value + ""))
-                    return `${name} is not a valid ${validator.regex.name}.`;
-            }
-        if (value != null)
-            if (validator.validator)
-            {
-                let error = validator.validator(name, value);
-                if (error)
-                    return error;
-            }
-        return null;
-    }
-    static getErrorString(name: string, value: string | null | undefined, validator: IValidationStringProps): string | null
-    {
-        if (value != null)
-        {
-            if (validator.max_length != null)
-                if (validator.max_length < value.length)
-                    return `Max length of ${name} should be ${validator.max_length} characters.`;
-            if (validator.min_length != null)
-                if (validator.min_length > value.length)
-                    return `Minlength of ${name} should be ${validator.min_length} characters.`;
-        }
-        return null;
-    }
-    static getErrorNumber(name: string, value: number | null | undefined, validator: IValidationNumberProps): string | null
-    {
-        if (value != null)
-        {
-            if (isNaN(value))
-                return `${name} is not a number.`;
-            if (validator.max != null)
-                if (validator.max < value)
-                    return `Max value of ${name} should be ${validator.max} characters.`;
-            if (validator.min != null)
-                if (validator.min > value)
-                    return `Min value of ${name} should be ${validator.min} characters.`;
-        }
-        return null;
-    }
-    static getErrorEmail(name: string, value: string | null | undefined, validator: IValidationProps): string | null
-    {
-        if (!validator.required)
-            if (!value)
-                return null;
-        return Validator.getError(name, value, {
-            required: true, regex: {
-                name: "Email",
-                regex: EmailSchema.REGEX
-            }
-        });
-    }
-    static getErrorDate(name: string, value: string | null | undefined): string | null
-    {
-        return Validator.getError(name, value, {
-            required: true, regex: {
-                name: "Date",
-                regex: DateSchema.REGEX
-            }
-        });
-    }
-    static getErrorTime(name: string, value: string | null | undefined): string | null
-    {
-        return Validator.getError(name, value, {
-            required: true, regex: {
-                name: "Time",
-                regex: TimeSchema.REGEX
-            }
-        });
-    }
-    static getErrorDateTime(name: string, value: Date | null | undefined): string | null
-    {
-        if (value != null)
-        {
-            const dateTime = new Date(value);
-            if (isNaN(dateTime.getTime()))
-                return `${value} is not a valid DateTime for ${name}.`;
-        }
-        return null;
-    }
-    static getErrorDuration(name: string, value: string | null | undefined): string | null
-    {
-        return Validator.getError(name, value, {
-            required: true, regex: {
-                name: "Duration",
-                regex: DurationSchema.REGEX
-            }
-        });
-    }
-    static getErrorIPV4(name: string, value: string | null | undefined): string | null
-    {
-        return Validator.getError(name, value, {
-            required: true, regex: {
-                name: "IP",
-                regex: IPV4Schema.REGEX
-            }
-        });
-    }
-    static getErrorIPV6(name: string, value: string | null | undefined): string | null
-    {
-        return Validator.getError(name, value, {
-            required: true, regex: {
-                name: "IP",
-                regex: IPV6Schema.REGEX
-            }
-        });
-    }
-    static getErrorPhone(name: string, value: string | null | undefined): string | null
-    {
-        return Validator.getError(name, value, {
-            required: true, validator: () =>
-            {
-                if (value)
-                    if (!PhoneOperation.isValid(value))
-                        return `${name} is not a valid phone number`;
-                return null;
-            }
-        });
-    }
+import { PhoneOperation } from "namirasoft-core";
+import { IValidationNumberProps } from "./props/IValidationNumberProps";
+import { IValidationProps } from "./props/IValidationProps";
+import { IValidationStringProps } from "./props/IValidationStringProps";
+import { DateSchema, DurationSchema, EmailSchema, IPV4Schema, IPV6Schema, TimeSchema } from "namirasoft-schema";
+
+export class Validator
+{
+    static getError(name: string, value: string | number | boolean | null | undefined, validator: IValidationProps): string | null
+    {
+        if (validator.required)
+            if (value == null || value === "")
+                return `${name} is required.`;
+        if (value != null)
+            if (validator.regex)
+            {
+                if (!new RegExp(validator.regex.regex).test(value + ""))
+                    return `${name} is not a valid ${validator.regex.name}.`;
+            }
+        if (value != null)
+            if (validator.validator)
+            {
+                let error = validator.validator(name, value);
+                if (error)
+                    return error;
+            }
+
+        if (value != null)
+        {
+            if (validator.valids)
+                if (validator.valids.length > 0)
+                    if (!validator.valids.includes(value + ""))
+                        return `${value} is not a valid value for ${name}. Valid values are ${validator.valids.join(", ")}.`;
+            if (validator.invalids)
+                if (validator.invalids.length > 0)
+                    if (validator.invalids.includes(value + ""))
+                        return `${value} is not a valid value for ${name}. Invalid values are ${validator.invalids.join(", ")}.`;
+        }
+        return null;
+    }
+    static getErrorString(name: string, value: string | null | undefined, validator: IValidationStringProps): string | null
+    {
+        if (value != null)
+        {
+            if (validator.max_length != null)
+                if (validator.max_length < value.length)
+                    return `Max length of ${name} should be ${validator.max_length} characters.`;
+            if (validator.min_length != null)
+                if (validator.min_length > value.length)
+                    return `Minlength of ${name} should be ${validator.min_length} characters.`;
+        }
+        return null;
+    }
+    static getErrorNumber(name: string, value: number | null | undefined, validator: IValidationNumberProps): string | null
+    {
+        if (value != null)
+        {
+            if (isNaN(value))
+                return `${name} is not a number.`;
+            if (validator.max != null)
+                if (validator.max < value)
+                    return `Max value of ${name} should be ${validator.max} characters.`;
+            if (validator.min != null)
+                if (validator.min > value)
+                    return `Min value of ${name} should be ${validator.min} characters.`;
+        }
+        return null;
+    }
+    static getErrorEmail(name: string, value: string | null | undefined, validator: IValidationProps): string | null
+    {
+        if (!validator.required)
+            if (!value)
+                return null;
+        return Validator.getError(name, value, {
+            required: true, regex: {
+                name: "Email",
+                regex: EmailSchema.REGEX
+            }
+        });
+    }
+    static getErrorDate(name: string, value: string | null | undefined): string | null
+    {
+        return Validator.getError(name, value, {
+            required: true, regex: {
+                name: "Date",
+                regex: DateSchema.REGEX
+            }
+        });
+    }
+    static getErrorTime(name: string, value: string | null | undefined): string | null
+    {
+        return Validator.getError(name, value, {
+            required: true, regex: {
+                name: "Time",
+                regex: TimeSchema.REGEX
+            }
+        });
+    }
+    static getErrorDateTime(name: string, value: Date | null | undefined): string | null
+    {
+        if (value != null)
+        {
+            const dateTime = new Date(value);
+            if (isNaN(dateTime.getTime()))
+                return `${value} is not a valid DateTime for ${name}.`;
+        }
+        return null;
+    }
+    static getErrorDuration(name: string, value: string | null | undefined): string | null
+    {
+        return Validator.getError(name, value, {
+            required: true, regex: {
+                name: "Duration",
+                regex: DurationSchema.REGEX
+            }
+        });
+    }
+    static getErrorIPV4(name: string, value: string | null | undefined): string | null
+    {
+        return Validator.getError(name, value, {
+            required: true, regex: {
+                name: "IP",
+                regex: IPV4Schema.REGEX
+            }
+        });
+    }
+    static getErrorIPV6(name: string, value: string | null | undefined): string | null
+    {
+        return Validator.getError(name, value, {
+            required: true, regex: {
+                name: "IP",
+                regex: IPV6Schema.REGEX
+            }
+        });
+    }
+    static getErrorPhone(name: string, value: string | null | undefined): string | null
+    {
+        return Validator.getError(name, value, {
+            required: true, validator: () =>
+            {
+                if (value)
+                    if (!PhoneOperation.isValid(value))
+                        return `${name} is not a valid phone number`;
+                return null;
+            }
+        });
+    }
 }

package/src/components/INSBox.tsx

@@ -0,0 +1,7 @@
+export interface INSBox
+{
+	getError(): string | null;
+	getValue(checkError: boolean): any;
+	setValue(value: any, callback?: () => void): void;
+	isEmpty(value: any): boolean;
+}

package/src/components/NSBarAction.module.css

@@ -1,83 +1,83 @@
-.ns_bar_action_holder {
-	z-index: 1;
-	padding: 0 16px;
-	position: sticky;
-	background-color: #fff;
-	width: 100%;
-	height: 100%;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: wrap;
-	justify-content: center;
-	align-items: center;
-	box-shadow: 0 4px 4px 0px rgba(0, 0, 0, 0.25);
-	-webkit-box-shadow: 0 4px 4px 0px rgba(0, 0, 0, 0.25);
-	-moz-box-shadow: 0 4px 4px 0px rgba(0, 0, 0, 0.25);
-}
-
-.ns_bar_action_grant_parent {
-	flex-direction: column;
-}
-
-.ns_bar_action_parent {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-direction: row;
-	flex-wrap: wrap;
-	margin: 16px 0px 16px 0px;
-}
-
-.ns_bar_action_actions_holder {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	flex-direction: column;
-	flex-wrap: wrap;
-	gap: 16px;
-	width: 100%;
-	margin: 16px 0px 16px 0px;
-}
-
-.ns_bar_action_info_container {
-	border: none;
-	outline: none;
-	background: none;
-}
-
-.ns_bar_action_title {
-	margin: 0px;
-	text-align: center;
-	color: rgba(20, 27, 92, 1);
-}
-
-
-@media only screen and (min-width: 480px) {
-	.ns_bar_action_actions_holder {
-		flex-direction: row;
-		flex: 1 1 0;
-	}
-
-	.ns_bar_action_grant_parent {
-		flex-direction: row;
-	}
-}
-
-@media only screen and (min-width: 1024px) {
-	.ns_bar_action_holder {
-		justify-content: space-between;
-		min-height: 80px;
-	}
-
-	.ns_bar_action_actions_holder {
-		justify-content: flex-end;
-	}
-
-	.ns_bar_action_info_container {
-		margin: 0;
-		display: flex;
-		align-items: center;
-		justify-content: flex-start;
-		gap: 4px;
-	}
+.ns_bar_action_holder {
+	z-index: 1;
+	padding: 0 16px;
+	position: sticky;
+	background-color: #fff;
+	width: 100%;
+	height: 100%;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	justify-content: center;
+	align-items: center;
+	box-shadow: 0 4px 4px 0px rgba(0, 0, 0, 0.25);
+	-webkit-box-shadow: 0 4px 4px 0px rgba(0, 0, 0, 0.25);
+	-moz-box-shadow: 0 4px 4px 0px rgba(0, 0, 0, 0.25);
+}
+
+.ns_bar_action_grant_parent {
+	flex-direction: column;
+}
+
+.ns_bar_action_parent {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-direction: row;
+	flex-wrap: wrap;
+	margin: 16px 0px 16px 0px;
+}
+
+.ns_bar_action_actions_holder {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-direction: column;
+	flex-wrap: wrap;
+	gap: 16px;
+	width: 100%;
+	margin: 16px 0px 16px 0px;
+}
+
+.ns_bar_action_info_container {
+	border: none;
+	outline: none;
+	background: none;
+}
+
+.ns_bar_action_title {
+	margin: 0px;
+	text-align: center;
+	color: rgba(20, 27, 92, 1);
+}
+
+
+@media only screen and (min-width: 480px) {
+	.ns_bar_action_actions_holder {
+		flex-direction: row;
+		flex: 1 1 0;
+	}
+
+	.ns_bar_action_grant_parent {
+		flex-direction: row;
+	}
+}
+
+@media only screen and (min-width: 1024px) {
+	.ns_bar_action_holder {
+		justify-content: space-between;
+		min-height: 80px;
+	}
+
+	.ns_bar_action_actions_holder {
+		justify-content: flex-end;
+	}
+
+	.ns_bar_action_info_container {
+		margin: 0;
+		display: flex;
+		align-items: center;
+		justify-content: flex-start;
+		gap: 4px;
+	}
 }

package/src/components/NSBarAction.tsx

@@ -1,86 +1,86 @@
-import { useState } from 'react';
-import Styles from './NSBarAction.module.css';
-import { NSMenuActionProps, NSMenuAction } from './NSMenuAction';
-import { NSDialogInfo } from './NSDialogInfo';
-
-export interface NSBarActionProps 
-{
-	title?: string;
-	description?: string;
-	menus?: { [group: string]: NSMenuActionProps[] };
-}
-
-export interface NSBarActionState
-{
-	show: boolean
-}
-
-export function isValidMenu(menus?: { [group: string]: NSMenuActionProps[] }) 
-{
-	let ans = false;
-	if (menus)
-		Object.keys(menus).forEach(menu =>
-		{
-			if (menus[menu].length > 0)
-				ans = true;
-		});
-	return ans;
-}
-
-export function isValidAction(props?: NSBarActionProps)
-{
-	if (props)
-		if (props.title?.trim() || props.description?.trim() || isValidMenu(props.menus))
-			return true;
-	return false;
-}
-
-export function NSBarAction(props: NSBarActionProps)
-{
-	const [state, setState] = useState<NSBarActionState>({
-		show: false
-	})
-
-	return (
-		<>
-			<div className={Styles.ns_bar_action_holder}>
-				<div className={`container d-flex justify-content-center justify-content-lg-between align-items-center w-100  ${Styles.ns_bar_action_grant_parent}`}>
-					{
-						(props.title?.trim() || props.description?.trim()) &&
-						<div className={`d-lg-flex ${Styles.ns_bar_action_parent}`}>
-							{
-								props.title?.trim() &&
-								<h1 className={Styles.ns_bar_action_title}>{props.title}</h1>
-							}
-							{
-								props.description?.trim() &&
-								<button className={Styles.ns_bar_action_info_container} onClick={() => setState({ show: true })}>
-									<img src='https://static.namirasoft.com/image/concept/info/white-blue.svg' alt='info-icon' width={24} height={24} />
-									<span> Info </span>
-								</button>
-							}
-							{
-								state.show &&
-								<NSDialogInfo
-									description={props.description}
-									title={props.title}
-									onClose={() => setState({ show: false })}
-								>
-									<></>
-								</NSDialogInfo>
-							}
-						</div>
-					}
-					{
-						props.menus && isValidMenu(props.menus) &&
-						<div className={Styles.ns_bar_action_actions_holder}>
-							{
-								Object.keys(props.menus ?? {}).map((group, index) => <NSMenuAction key={`NSBarAction_NSMenuAction_Key_${index}`} name={group} items={(props.menus ?? {})[group]} />)
-							}
-						</div>
-					}
-				</div>
-			</div>
-		</>
-	);
+import { useState } from 'react';
+import Styles from './NSBarAction.module.css';
+import { NSMenuActionProps, NSMenuAction } from './NSMenuAction';
+import { NSDialogInfo } from './NSDialogInfo';
+
+export interface NSBarActionProps 
+{
+	title?: string;
+	description?: string;
+	menus?: { [group: string]: NSMenuActionProps[] };
+}
+
+export interface NSBarActionState
+{
+	show: boolean
+}
+
+export function isValidMenu(menus?: { [group: string]: NSMenuActionProps[] }) 
+{
+	let ans = false;
+	if (menus)
+		Object.keys(menus).forEach(menu =>
+		{
+			if (menus[menu].length > 0)
+				ans = true;
+		});
+	return ans;
+}
+
+export function isValidAction(props?: NSBarActionProps)
+{
+	if (props)
+		if (props.title?.trim() || props.description?.trim() || isValidMenu(props.menus))
+			return true;
+	return false;
+}
+
+export function NSBarAction(props: NSBarActionProps)
+{
+	const [state, setState] = useState<NSBarActionState>({
+		show: false
+	})
+
+	return (
+		<>
+			<div className={Styles.ns_bar_action_holder}>
+				<div className={`container d-flex justify-content-center justify-content-lg-between align-items-center w-100  ${Styles.ns_bar_action_grant_parent}`}>
+					{
+						(props.title?.trim() || props.description?.trim()) &&
+						<div className={`d-lg-flex ${Styles.ns_bar_action_parent}`}>
+							{
+								props.title?.trim() &&
+								<h1 className={Styles.ns_bar_action_title}>{props.title}</h1>
+							}
+							{
+								props.description?.trim() &&
+								<button className={Styles.ns_bar_action_info_container} onClick={() => setState({ show: true })}>
+									<img src='https://static.namirasoft.com/image/concept/info/white-blue.svg' alt='info-icon' width={24} height={24} />
+									<span> Info </span>
+								</button>
+							}
+							{
+								state.show &&
+								<NSDialogInfo
+									description={props.description}
+									title={props.title}
+									onClose={() => setState({ show: false })}
+								>
+									<></>
+								</NSDialogInfo>
+							}
+						</div>
+					}
+					{
+						props.menus && isValidMenu(props.menus) &&
+						<div className={Styles.ns_bar_action_actions_holder}>
+							{
+								Object.keys(props.menus ?? {}).map((group, index) => <NSMenuAction key={`NSBarAction_NSMenuAction_Key_${index}`} name={group} items={(props.menus ?? {})[group]} />)
+							}
+						</div>
+					}
+				</div>
+			</div>
+		</>
+	);
 }